github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix regression introduced when moving to standalone salt

Browse Source
This commit is contained in:
derekwaynecarr 2015-03-10 16:47:26 -04:00
parent 20853410bd
commit f71a91a131
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/saltbase/pillar/mine.sls
View File

@ -1,6 +1,6 @@
{% if grains.cloud is defined and grains.cloud == 'gce' -%}
# On GCE, there is no Salt mine. We run standalone. # 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 # Allow everyone to see cached values of who sits at what IP
{% set networkInterfaceName = "eth0" %} {% set networkInterfaceName = "eth0" %}
{% if grains.networkInterfaceName is defined %} {% if grains.networkInterfaceName is defined %}
@ -9,5 +9,4 @@
mine_functions: mine_functions:
network.ip_addrs: [{{networkInterfaceName}}] network.ip_addrs: [{{networkInterfaceName}}]
grains.items: [] grains.items: []
{% endif -%} {% endif -%}

1
cluster/vagrant/provision-minion.sh
View File

@ -64,6 +64,7 @@ EOF
# Our minions will have a pool role to distinguish them from the master. # Our minions will have a pool role to distinguish them from the master.
cat <<EOF >/etc/salt/minion.d/grains.conf cat <<EOF >/etc/salt/minion.d/grains.conf
grains: grains:
cloud: vagrant
network_mode: openvswitch network_mode: openvswitch
node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")' node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")' etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'