update init as root

liaohuqiu · Dec 28, 2016 · 05b8ff8 · 05b8ff8
1 parent 98f3375
commit 05b8ff8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/local-init.sh b/local-init.sh
@@ -41,8 +41,6 @@ function install_docker() {
     if hash docker 2>/dev/null; then
         echo 'Docker has installed.'
     else
-        exe_cmd 'sudo ip addr add 172.17.0.0/16 dev docker0'
-        exe_cmd 'sudo ip link set dev docker0 up'
 		# build docker config
 		local docker_config_path='/etc/sysconfig'
         if [ ! -d "$docker_config_path" ]; then
@@ -53,8 +51,9 @@ function install_docker() {
         exe_cmd "sudo cp $config_templates_path/docker/kubernetes.repo /usr/lib/systemd/system/docker.service"
 
         exe_cmd "sudo setenforce 0"
-        exe_cmd "sudo yum install -y docker kubelet kubeadm kubectl kubernetes-cni"
         exe_cmd "sudo systemctl enable docker && sudo systemctl start docker"
+
+        exe_cmd "sudo yum install -y docker kubelet kubeadm kubectl kubernetes-cni"
         exe_cmd "sudo systemctl enable kubelet && sudo systemctl start kubelet"
     fi
 

diff --git a/server-init/init-as-root.sh b/server-init/init-as-root.sh
@@ -14,17 +14,23 @@ ssh_pub_key=$2
 hostname=$3
 
 function init_env() {
-    exe_cmd "yum install git -y"
-
     exe_cmd "firewall-cmd --zone=public --add-port=22/tcp --permanent"
     exe_cmd "firewall-cmd --zone=public --add-port=53/udp --permanent"
     exe_cmd "firewall-cmd --zone=public --add-port=80/tcp --permanent"
     exe_cmd "firewall-cmd --zone=public --add-port=443/tcp --permanent"
     exe_cmd "firewall-cmd --zone=public --add-port=11122/tcp --permanent"
+
     exe_cmd "firewall-cmd --permanent --zone=trusted --change-interface=docker0"
     exe_cmd "firewall-cmd --permanent --direct --add-rule  ipv4 nat POSTROUTING 0 -j MASQUERADE"
-    exe_cmd "systemctl restart firewalld.service"
     exe_cmd "hostnamectl set-hostname $hostname"
+
+    exe_cmd "systemctl start firewalld.service"
+    exe_cmd "sudo systemctl enable firewalld && sudo systemctl start firewalld.service"
+
+    exe_cmd 'sudo brctl addbr docker0'
+    exe_cmd 'sudo ip addr add 172.20.0.0/16 dev docker0'
+    exe_cmd 'sudo ip link set dev docker0 up'
+    exe_cmd "yum install git docker -y"
 }
 
 function init_user()