mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Fix regression introduced when moving to standalone salt
This commit is contained in:
parent
20853410bd
commit
f71a91a131
@ -1,6 +1,6 @@
|
||||
{% if grains.cloud is defined and grains.cloud == 'gce' -%}
|
||||
# On GCE, there is no Salt mine. We run standalone.
|
||||
{% if grains.cloud != 'gce' -%}
|
||||
|
||||
{% else %}
|
||||
# Allow everyone to see cached values of who sits at what IP
|
||||
{% set networkInterfaceName = "eth0" %}
|
||||
{% if grains.networkInterfaceName is defined %}
|
||||
@ -9,5 +9,4 @@
|
||||
mine_functions:
|
||||
network.ip_addrs: [{{networkInterfaceName}}]
|
||||
grains.items: []
|
||||
|
||||
{% endif -%}
|
||||
|
@ -64,6 +64,7 @@ EOF
|
||||
# Our minions will have a pool role to distinguish them from the master.
|
||||
cat <<EOF >/etc/salt/minion.d/grains.conf
|
||||
grains:
|
||||
cloud: vagrant
|
||||
network_mode: openvswitch
|
||||
node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
|
||||
etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
|
||||
|
Loading…
Reference in New Issue
Block a user