commit fbb9832b5c84d2d63e0ca1bd880d08e4b092e7ad
author Tomáš Kukrál <tomkukral@users.noreply.github.com> Tue May 02 10:38:05 2017 +0200
committer Tomáš Kukrál <tomkukral@users.noreply.github.com> Tue May 02 10:38:05 2017 +0200
tree 3c0ee37fd9686301f83647de798d678aba6a8810
parent 1f8b501afb0c83c6517483778924e5c34deba2b3

fix wrong saltmaster reference

Change-Id: Id52c010148b80466e29bab089056ee46b0cc1803

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 6201f76..5a26ba5 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -146,7 +146,7 @@
 
                     // Overwrite Kubernetes vars if specified
                     if (env.getEnvironment().containsKey("KUBERNETES_HYPERKUBE_IMAGE")) {
-                        salt.runSaltProcessStep(master, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_hyperkube_image: ${KUBERNETES_HYPERKUBE_IMAGE}")
+                        salt.runSaltProcessStep(saltMaster, 'I@salt:master', 'file.append', overwriteFile, "    kubernetes_hyperkube_image: ${KUBERNETES_HYPERKUBE_IMAGE}")
                     }
 
                     orchestrate.installKubernetesControl(saltMaster)
@@ -173,8 +173,8 @@
                         orchestrate.installOpenstackNetwork(saltMaster)
                     }
 
-                    salt.runSaltProcessStep(master, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; neutron net-list'])
-                    salt.runSaltProcessStep(master, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; nova net-list'])
+                    salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; neutron net-list'])
+                    salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; nova net-list'])
                 }
 
                 stage('Install OpenStack compute') {