commit 30afef9e45daee40f23075ffb44a5b901c511110
author Matthew Mosesohn <mmosesohn@mirantis.com> Wed Jul 19 16:49:45 2017 +0300
committer Matthew Mosesohn <mmosesohn@mirantis.com> Wed Jul 19 16:49:45 2017 +0300
tree 938b05a30faf5d3ce91578ff711903a8eb12cc22
parent 96254e2b34b81dad5549df6a2709751c8861b5d2

Set up overrides after infra setup

Change-Id: I6fa08c221aba70b9e1693586368e44234ed49a26

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 84f5dcf..043324b 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -152,12 +152,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
             //
@@ -175,6 +169,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')) {