From 0178dba38149673227771e139b8e17c6430731f3 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Fri, 25 Sep 2015 13:38:15 +0800
Subject: [PATCH 1/2] add support for CentOS via multi-docker

---
 .../docker-multinode/master.sh                       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh
index d785af2e171..6fd7c2d6d79 100755
--- a/docs/getting-started-guides/docker-multinode/master.sh
+++ b/docs/getting-started-guides/docker-multinode/master.sh
@@ -109,22 +109,22 @@ start_k8s(){
     case "$lsb_dist" in
         fedora|centos|amzn)
             DOCKER_CONF="/etc/sysconfig/docker"
+            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+            if ! command_exists ifconfig; then
+                yum install -y -q net-tools
+            fi
         ;;
         ubuntu|debian|linuxmint)
             DOCKER_CONF="/etc/default/docker"
+            echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
         ;;
     esac
 
-    # Append the docker opts
-    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
-
-
-    # sleep a little bit
     ifconfig docker0 down
 
     case "$lsb_dist" in
         fedora|centos|amzn)
-            yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
+            yum install -y -q bridge-utils && brctl delbr docker0 && systemctl restart docker
         ;;
         ubuntu|debian|linuxmint)
             apt-get install bridge-utils && brctl delbr docker0 && service docker restart

From d3f160ff131ebc71a275269a4ff8e215b91b2091 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Fri, 25 Sep 2015 15:40:07 +0800
Subject: [PATCH 2/2] add support for amzn

---
 .../docker-multinode/master.sh                | 26 ++++++++--------
 .../docker-multinode/worker.sh                | 30 ++++++++++---------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/docs/getting-started-guides/docker-multinode/master.sh b/docs/getting-started-guides/docker-multinode/master.sh
index 6fd7c2d6d79..a1129770820 100755
--- a/docs/getting-started-guides/docker-multinode/master.sh
+++ b/docs/getting-started-guides/docker-multinode/master.sh
@@ -107,26 +107,24 @@ start_k8s(){
 
     # Configure docker net settings, then restart it
     case "$lsb_dist" in
-        fedora|centos|amzn)
+        amzn)
+            DOCKER_CONF="/etc/sysconfig/docker"
+            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+            ifconfig docker0 down
+            yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart
+        ;;
+        centos)
             DOCKER_CONF="/etc/sysconfig/docker"
             echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
             if ! command_exists ifconfig; then
-                yum install -y -q net-tools
+                yum -y -q install net-tools
             fi
-        ;;
-        ubuntu|debian|linuxmint)
+            ifconfig docker0 down
+            yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker
+        ubuntu|debian)
             DOCKER_CONF="/etc/default/docker"
             echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
-        ;;
-    esac
-
-    ifconfig docker0 down
-
-    case "$lsb_dist" in
-        fedora|centos|amzn)
-            yum install -y -q bridge-utils && brctl delbr docker0 && systemctl restart docker
-        ;;
-        ubuntu|debian|linuxmint)
+            ifconfig docker0 down
             apt-get install bridge-utils && brctl delbr docker0 && service docker restart
         ;;
     esac
diff --git a/docs/getting-started-guides/docker-multinode/worker.sh b/docs/getting-started-guides/docker-multinode/worker.sh
index 382aab5ccfd..dbfebf226ce 100755
--- a/docs/getting-started-guides/docker-multinode/worker.sh
+++ b/docs/getting-started-guides/docker-multinode/worker.sh
@@ -109,23 +109,25 @@ start_k8s() {
 
     # Configure docker net settings, then restart it
     case "$lsb_dist" in
-        fedora|centos|amzn)
+        centos)
             DOCKER_CONF="/etc/sysconfig/docker"
+            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+            if ! command_exists ifconfig; then
+                yum -y -q install net-tools
+            fi
+            ifconfig docker0 down
+            yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker
         ;;
-        ubuntu|debian|linuxmint)
+        amzn)
+            DOCKER_CONF="/etc/sysconfig/docker"
+            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+            ifconfig docker0 down
+            yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart
+        ;;
+        ubuntu|debian)
             DOCKER_CONF="/etc/default/docker"
-        ;;
-    esac
-
-    echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
-
-    ifconfig docker0 down
-
-    case "$lsb_dist" in
-        fedora|centos)
-            yum install bridge-utils && brctl delbr docker0 && systemctl restart docker
-        ;;
-        ubuntu|debian|linuxmint)
+            echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
+            ifconfig docker0 down
             apt-get install bridge-utils && brctl delbr docker0 && service docker restart
         ;;
     esac