Merge pull request #1842 from mrunalp/remove_ip_masq

Need not add --ip-masq flag till fedora ships docker 1.3
This commit is contained in:
Tim Hockin 2014-10-16 12:46:01 -07:00
commit 694878c642

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 --ip-masq=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/g" /usr/lib/systemd/system/docker.service
systemctl daemon-reload
systemctl restart docker.service