fix error related to flannel network in CentOS 7 cluster creation scripts

c171a96d · Yagnesh Mistry · 81054463 · c171a96d · c171a96d
Commit c171a96d authored Jan 19, 2016 by Yagnesh Mistry
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docker.sh cluster/centos/node/scripts/docker.sh +0 -1

flannel.sh cluster/centos/node/scripts/flannel.sh +1 -0

No files found.
--- a/cluster/centos/node/scripts/docker.sh
+++ b/cluster/centos/node/scripts/docker.sh
@@ -35,7 +35,6 @@ Type=notify
 EnvironmentFile=-/run/flannel/docker
 EnvironmentFile=-/opt/kubernetes/cfg/docker
 WorkingDirectory=/opt/kubernetes/bin
-ExecStartPre=/opt/kubernetes/bin/remove-docker0.sh
 ExecStart=/opt/kubernetes/bin/docker daemon \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPTS
 LimitNOFILE=1048576
 LimitNPROC=1048576

--- a/cluster/centos/node/scripts/flannel.sh
+++ b/cluster/centos/node/scripts/flannel.sh
@@ -32,6 +32,7 @@ Before=docker.service

 [Service]
 EnvironmentFile=-/opt/kubernetes/cfg/flannel
+ExecStartPre=/opt/kubernetes/bin/remove-docker0.sh
 ExecStart=/opt/kubernetes/bin/flanneld --ip-masq \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
 ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker