Merge pull request #6262 from zmerlynn/rm_master_ip

rm Salt grains.master_ip
2015-04-01 11:10:48 -04:00
parent b9babb56b0 0806e3bde0
commit 762c449043
2 changed files with 0 additions and 3 deletions
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -74,7 +74,6 @@ EOF
 cat <<EOF >/etc/salt/minion.d/grains.conf
 grains:
  node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
-  master_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
  publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
  network_mode: openvswitch
  networkInterfaceName: eth1