commit 0ea82db8c3b5eefc2b3c3a3c0d0eb3cea8c8debb
author Tomáš Kukrál <tkukral@mirantis.com> Tue May 02 11:16:05 2017 +0200
committer Tomáš Kukrál <tkukral@mirantis.com> Tue May 02 11:16:05 2017 +0200
tree 834957730324368cd5b6e715b1e9c11e33c49101
parent b05cf00dc4a81619a00143c7882ca38347870b79

install k8s with gluster only when requested

Change-Id: Ida70241668d4fcd0c8d0f0a226b61dea992c3bf1

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index b737e6c..baeca31 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -219,19 +219,24 @@
 
 
 def installKubernetesInfra(master) {
+    def common = new com.mirantis.mk.Common()
     def salt = new com.mirantis.mk.Salt()
 
     // Install glusterfs
-    salt.enforceState(master, 'I@glusterfs:server', 'glusterfs.server.service')
+    if (common.checkContains('INSTALL', 'glusterfs')) {
+        salt.enforceState(master, 'I@glusterfs:server', 'glusterfs.server.service')
+    }
 
     // Install keepalived
     salt.enforceState(master, 'I@keepalived:cluster and *01*', 'keepalived')
     salt.enforceState(master, 'I@keepalived:cluster', 'keepalived')
 
     // Setup glusterfs
-    salt.enforceState(master, 'I@glusterfs:server and *01*', 'glusterfs.server.setup')
-    salt.runSaltProcessStep(master, 'I@glusterfs:server', 'cmd.run', ['gluster peer status'])
-    salt.runSaltProcessStep(master, 'I@glusterfs:server', 'cmd.run', ['gluster volume status'])
+    if (common.checkContains('INSTALL', 'glusterfs')) {
+        salt.enforceState(master, 'I@glusterfs:server and *01*', 'glusterfs.server.setup')
+        salt.runSaltProcessStep(master, 'I@glusterfs:server', 'cmd.run', ['gluster peer status'])
+        salt.runSaltProcessStep(master, 'I@glusterfs:server', 'cmd.run', ['gluster volume status'])
+    }
 
     // Install haproxy
     salt.enforceState(master, 'I@haproxy:proxy', 'state.sls', 'haproxy')