openstack
/
murano-apps
Code Issues Proposed changes

Merge "[kubernetes][app] Fix flannel settings for docker"

This commit is contained in:
Jenkins 2016-08-17 14:41:57 +00:00 committed by Gerrit Code Review
parent 1615a58c65 629cbd1a93
commit b5af9999e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/Kubernetes/KubernetesCluster/package/Resources/scripts/setupFlannelNode.sh
View File

@ -28,7 +28,7 @@ done
ip link set dev docker0 down
brctl delbr docker0
echo "DOCKER_OPTS=-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}" > /etc/default/docker
echo DOCKER_OPTS=\"-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}\" > /etc/default/docker
echo post-up iptables -t nat -A POSTROUTING -s 10.200.0.0/16 ! -d 10.200.0.0/16 -j MASQUERADE >> /etc/network/interfaces.d/eth0.cfg
iptables -t nat -A POSTROUTING -s 10.200.0.0/16 ! -d 10.200.0.0/16 -j MASQUERADE