github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1913 from derekwaynecarr/move_network_closure

Browse Source 
Do not require a writeable /vagrant
This commit is contained in:
Joe Beda 2014-10-20 15:04:43 -07:00
commit 893e897d9b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/sdn/init.sls
View File

@ -8,7 +8,7 @@ openvswitch:
sdn: sdn:
cmd.wait: cmd.wait:
- name: /vagrant/network_closure.sh - name: /kubernetes-vagrant/network_closure.sh
- watch: - watch:
- pkg: docker-io - pkg: docker-io
- pkg: openvswitch - pkg: openvswitch

8
cluster/vagrant/provision-network.sh
View File

@ -29,7 +29,11 @@ BRIDGE_ADDRESS=${BRIDGE_BASE}.${MINION_ID}.1
BRIDGE_NETWORK=${BRIDGE_ADDRESS}/24 BRIDGE_NETWORK=${BRIDGE_ADDRESS}/24
BRIDGE_NETMASK=255.255.255.0 BRIDGE_NETMASK=255.255.255.0
NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/ 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 # add docker bridge ifcfg file
cat <<EOF > ${NETWORK_CONF_PATH}ifcfg-${DOCKER_BRIDGE} cat <<EOF > ${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 # persist please
iptables-save >& /etc/sysconfig/iptables iptables-save >& /etc/sysconfig/iptables
# self-destruct after doing the job
#rm -f ${POST_NETWORK_SCRIPT}
EOF EOF
chmod +x ${POST_NETWORK_SCRIPT} chmod +x ${POST_NETWORK_SCRIPT}