mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #1913 from derekwaynecarr/move_network_closure
Do not require a writeable /vagrant
This commit is contained in:
commit
893e897d9b
@ -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
|
||||
|
@ -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 <<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
|
||||
iptables-save >& /etc/sysconfig/iptables
|
||||
|
||||
# self-destruct after doing the job
|
||||
#rm -f ${POST_NETWORK_SCRIPT}
|
||||
EOF
|
||||
|
||||
chmod +x ${POST_NETWORK_SCRIPT}
|
||||
|
Loading…
Reference in New Issue
Block a user