diff --git a/cluster/saltbase/salt/sdn/init.sls b/cluster/saltbase/salt/sdn/init.sls index 2d69a53e5d7..0f020533510 100644 --- a/cluster/saltbase/salt/sdn/init.sls +++ b/cluster/saltbase/salt/sdn/init.sls @@ -8,7 +8,7 @@ openvswitch: sdn: cmd.wait: - - name: /vagrant/network_closure.sh + - name: /kubernetes-vagrant/network_closure.sh - watch: - pkg: docker-io - pkg: openvswitch diff --git a/cluster/vagrant/provision-network.sh b/cluster/vagrant/provision-network.sh index 00cbb6c3b24..0994b27e987 100755 --- a/cluster/vagrant/provision-network.sh +++ b/cluster/vagrant/provision-network.sh @@ -29,7 +29,11 @@ BRIDGE_ADDRESS=${BRIDGE_BASE}.${MINION_ID}.1 BRIDGE_NETWORK=${BRIDGE_ADDRESS}/24 BRIDGE_NETMASK=255.255.255.0 NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/ -POST_NETWORK_SCRIPT=/vagrant/network_closure.sh +POST_NETWORK_SCRIPT_DIR=/kubernetes-vagrant +POST_NETWORK_SCRIPT=${POST_NETWORK_SCRIPT_DIR}/network_closure.sh + +# ensure location of POST_NETWORK_SCRIPT exists +mkdir -p $POST_NETWORK_SCRIPT_DIR # add docker bridge ifcfg file cat < ${NETWORK_CONF_PATH}ifcfg-${DOCKER_BRIDGE} @@ -106,8 +110,6 @@ iptables -t nat -A POSTROUTING -s ${BRIDGE_BASE}.0.0/16 ! -d ${BRIDGE_BASE}.0.0/ # persist please iptables-save >& /etc/sysconfig/iptables -# self-destruct after doing the job -#rm -f ${POST_NETWORK_SCRIPT} EOF chmod +x ${POST_NETWORK_SCRIPT}