commit 2ede68611b6c394f301ac352b16973a219be656f
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Aug 03 12:33:38 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Fri Aug 03 12:33:38 2018 +0000
tree 6fcad8f91d7c5de78a654aaefb43fd6dd0ece7b7
parent 8f3813b6af499c824bdb01b2c330e8733f7b842d
parent e96a867e546476754dff4f654b3944bf170349a4

Merge "Remove redundant installInfra call from installOssInfra"

src/com/mirantis/mk/Orchestrate.groovy

diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index abe4b5d..d513822 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -1209,11 +1209,6 @@
   def common = new com.mirantis.mk.Common()
   def salt = new com.mirantis.mk.Salt()
 
-  if (!common.checkContains('STACK_INSTALL', 'k8s') || !common.checkContains('STACK_INSTALL', 'openstack')) {
-    def orchestrate = new com.mirantis.mk.Orchestrate()
-    orchestrate.installInfra(master)
-  }
-
   if (salt.testTarget(master, "I@devops_portal:config ${extra_tgt}")) {
     salt.enforceState(master, "I@devops_portal:config ${extra_tgt}", 'devops_portal.config')
     salt.enforceState(master, "I@rundeck:client ${extra_tgt}", ['linux.system.user', 'openssh'])