commit 99a9b522a631fdcce58853ea3347ce042c432fc5
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Oct 18 12:47:30 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Oct 18 12:47:30 2018 +0000
tree 6a2fcaff8f0d24630ee50d6362cff3a79692a243
parent 0da3b6fb5ee672b23bada8e9599e7336400d17fa
parent f8838ebc9a00b6daecfa5beece4fd8e8d25fce35

Merge "Revert "Update if condition for product generation""

src/com/mirantis/mk/Python.groovy

diff --git a/src/com/mirantis/mk/Python.groovy b/src/com/mirantis/mk/Python.groovy
index 11f9e2a..c3b2c97 100644
--- a/src/com/mirantis/mk/Python.groovy
+++ b/src/com/mirantis/mk/Python.groovy
@@ -302,9 +302,8 @@
                 productDir = "stacklight2"
                 templateDir = "${templateEnvDir}/cluster_product/${productDir}"
             }
-            // generate infra unless its explicitly disabled
-            if ((product == "infra" && templateContext.default_context.get("infra_enabled", "True").toBoolean())
-                 || templateContext.default_context.get("${product}_enabled", "False").toBoolean()) {
+            if (product == "infra" || (templateContext.default_context["${product}_enabled"]
+                && templateContext.default_context["${product}_enabled"].toBoolean())) {
 
                 common.infoMsg("Generating product " + product + " from " + templateDir + " to " + templateOutputDir)