commit c8ea2aeec10a4f0bf46f3391777d1903b4f202ab
author Jakub Josef <jjosef@mirantis.com> Wed Jul 19 14:13:59 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Wed Jul 19 14:14:02 2017 +0000
tree a4aa1c00f284e68bee2c581c0c4a452bd459af66
parent 9ad6c1381789042a2119188388879019b507f2a6
parent 30afef9e45daee40f23075ffb44a5b901c511110

Merge "Set up overrides after infra setup"

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index 12db6d1..2d186ec 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -190,13 +190,6 @@
                 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
             //
@@ -214,6 +207,14 @@
                 }
             }
 
+            // 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')) {
 

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 18eb564..4e70930 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -160,12 +160,6 @@
                 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
             //
@@ -183,6 +177,13 @@
                 }
             }
 
+            // 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')) {