github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1841 from dchen1107/release

Browse Source 
Set --ip-masq to false for docker 1.3
This commit is contained in:
Tim Hockin 2014-10-16 12:35:03 -07:00
commit 98eb498e30
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/docker-defaults
View File

@ -1 +1 @@
DOCKER_OPTS="--bridge cbr0 --iptables=false -r=false"
DOCKER_OPTS="--bridge cbr0 --iptables=false --ip-masq=false -r=false"

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

@ -96,7 +96,7 @@ ip link set dev ${DOCKER_BRIDGE} up
ovs-vsctl set Bridge ${OVS_SWITCH} stp_enable=true
# modify the docker service file such that it uses the kube docker bridge and not its own
sed -ie "s/ExecStart=\/usr\/bin\/docker -d/ExecStart=\/usr\/bin\/docker -d -b=${DOCKER_BRIDGE} --iptables=false/g" /usr/lib/systemd/system/docker.service
sed -ie "s/ExecStart=\/usr\/bin\/docker -d/ExecStart=\/usr\/bin\/docker -d -b=${DOCKER_BRIDGE} --iptables=false --ip-masq=false/g" /usr/lib/systemd/system/docker.service
systemctl daemon-reload
systemctl restart docker.service