Fix regression introduced when moving to standalone salt

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

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.
{% 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 -%}

View File

@ -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")'