commit e65f7b061dcc8e951bbeff470df53e0bc032575d
author Tomáš Kukrál <tkukral@mirantis.com> Thu Jan 19 13:16:43 2017 +0100
committer Tomáš Kukrál <tkukral@mirantis.com> Thu Jan 19 16:04:22 2017 +0100
tree b66d87650b8d9cf3dbd768009a2439148476536c
parent e0948fd5ef25d25ca6f603014203d2af53ddc277

Update k8s deploy steps

Change deploy steps to comply with updated salt-formula-kubernetes

Change-Id: I4ef1a542d82e4d241828873b40e261934538368a

src/com/mirantis/mk/salt.groovy

diff --git a/src/com/mirantis/mk/salt.groovy b/src/com/mirantis/mk/salt.groovy
index 93036bd..20f660d 100644
--- a/src/com/mirantis/mk/salt.groovy
+++ b/src/com/mirantis/mk/salt.groovy
@@ -367,21 +367,28 @@
 
 
 def installOpenstackMcpControl(master) {
-    // Pull Calico image
-    runSaltProcessStep(master, 'I@kubernetes:pool', 'dockerng.pull', ['calico/node:latest'])
-    // Install Kubernetes and Calico
-    runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['kubernetes.master.service,kubernetes.master.kube-addons'])
+
+    // Install Kubernetes pool and Calico
     runSaltProcessStep(master, 'I@kubernetes:pool', 'state.sls', ['kubernetes.pool'])
-    runSaltProcessStep(master, 'I@kubernetes:pool', 'cmd.run', ['calicoctl status'])
-    // Setup NAT for Calico
+    runSaltProcessStep(master, 'I@kubernetes:pool', 'cmd.run', ['calicoctl node status'])
+
+    // Setup etcd server
     runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['etcd.server.setup'])
-    // Run whole k8s controller
-    runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['kubernetes.controller'])
-    // Run whole k8s controller
-    runSaltProcessStep(master, 'ctl01*', 'state.sls', ['kubernetes'])
-    runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['kubernetes'])
+
+    // Run k8s without master.setup
+    runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['kubernetes', 'exclude=kubernetes.master.setup'])
+
+    // Run k8s master setup
+    runSaltProcessStep(master, 'I@kubernetes:master', 'state.sls', ['kubernetes.master.setup'], 1)
+
     // Revert comment nameserver
     runSaltProcessStep(master, 'I@kubernetes:master', 'cmd.run', ["sed -i 's/nameserver 10.254.0.10/#nameserver 10.254.0.10/g' /etc/resolv.conf"])
+
+    // Set route
+    runSaltProcessStep(master, 'I@kubernetes:pool', 'cmd.run', ['ip r a 10.254.0.0/16 dev ens4'])
+
+    // Restart kubelet
+    runSaltProcessStep(master, 'I@kubernetes:pool', 'service.restart', ['kubelet'])
 }