From baf3bea79ade208529aafef32706f8872a902dc6 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 16 Oct 2014 11:58:06 -0700 Subject: [PATCH 1/2] Set --ip-masq to false --- cluster/saltbase/salt/docker/docker-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults index 98a4f5b0d74..1317593c272 100644 --- a/cluster/saltbase/salt/docker/docker-defaults +++ b/cluster/saltbase/salt/docker/docker-defaults @@ -1 +1 @@ -DOCKER_OPTS="--bridge cbr0 --iptables=false -r=false" +DOCKER_OPTS="--bridge cbr0 --iptables=false --ip-masq=false -r=false" From a8a036a9e6e6498d0ab2bb1b59b2c312a81300be Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Thu, 16 Oct 2014 12:09:31 -0700 Subject: [PATCH 2/2] Disable --ip-masq for vagrand. --- cluster/vagrant/provision-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/vagrant/provision-network.sh b/cluster/vagrant/provision-network.sh index 00cbb6c3b24..42f0fc948f8 100755 --- a/cluster/vagrant/provision-network.sh +++ b/cluster/vagrant/provision-network.sh @@ -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