From c171a96d15313bce338b982ba09dcb99da33d22a Mon Sep 17 00:00:00 2001
From: Yagnesh Mistry <yagnesh.mistry@bookmyshow.com>
Date: Tue, 19 Jan 2016 17:17:50 +0530
Subject: [PATCH] fix error related to flannel network in CentOS 7 cluster
 creation scripts

---
 cluster/centos/node/scripts/docker.sh  | 1 -
 cluster/centos/node/scripts/flannel.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/centos/node/scripts/docker.sh b/cluster/centos/node/scripts/docker.sh
index 5d1b6ebfd36..1073e1fc315 100755
--- 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
diff --git a/cluster/centos/node/scripts/flannel.sh b/cluster/centos/node/scripts/flannel.sh
index f92601d9e1b..1c88eb51873 100755
--- 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