commit b045ea9596be179d66670403f5ca37d84b84aad0
author jenkins-mk jenkins-mk <jenkins-mk@gerrit.mcp.mirantis.net> Mon Jul 31 11:41:12 2017 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> Mon Jul 31 11:41:13 2017 +0000
tree f14a4508dbaf385f5bf82cabc09385ee18a3e51d
parent 3a17dd66fb87a8c08a3f565850dd5b993374ef99
parent 70fec6613b061299c62aa47d356ad3ef43902863

Merge "Move SALT_OVERRIDES right after stack created"

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 4fe0a77..9f4571c 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -183,6 +183,13 @@
                 saltMaster = salt.connection(SALT_MASTER_URL, SALT_MASTER_CREDENTIALS)
             }
 
+            // Set up override params
+            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
+                stage('Set Salt overrides') {
+                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
+                }
+            }
+
             //
             // Install
             //
@@ -200,13 +207,6 @@
                 }
             }
 
-            // Set up override params
-            if (env.getEnvironment().containsKey('SALT_OVERRIDES')) {
-                stage('Set Salt overrides') {
-                    salt.setSaltOverrides(saltMaster,  SALT_OVERRIDES)
-                }
-            }
-
             // install k8s
             if (common.checkContains('STACK_INSTALL', 'k8s')) {