commit bf77c21cb5bc9ef61b684e781e4a0eb445efc444
author chnyda <chnyda@mirantis.com> Wed Nov 15 11:17:00 2017 +0100
committer Cedric Hnyda <chnyda@mirantis.com> Wed Nov 15 10:17:51 2017 +0000
tree 8756462129e24beed25cb41b8aa1852473319fc3
parent 0d09cf4d36a94033e85b53a5a448fd24e439d5b3

Fix pepperenv in openstack-compute-install

Change-Id: Iea82898f071c136acd69037e557b25b6dbbcac22

openstack-compute-install.groovy

diff --git a/openstack-compute-install.groovy b/openstack-compute-install.groovy
index 82a3e40..3cf6aaa 100644
--- a/openstack-compute-install.groovy
+++ b/openstack-compute-install.groovy
@@ -39,13 +39,13 @@
         }
 
         stage("Trusty workaround") {
-            if(salt.getGrain(saltMaster, minions[0], "oscodename")['return'][0].values()[0]["oscodename"] == "trusty") {
+            if(salt.getGrain(pepperEnv, minions[0], "oscodename")['return'][0].values()[0]["oscodename"] == "trusty") {
                 common.infoMsg("First node %nodename% has trusty")
                 common.infoMsg("Assuming trusty on all cluster, running extra network states...")
                 common.infoMsg("Network iteration #1. Bonding")
-                salt.enforceState(saltMaster, targetLiveAll, 'linux.network', true)
+                salt.enforceState(pepperEnv, targetLiveAll, 'linux.network', true)
                 common.infoMsg("Network iteration #2. Vlan tagging and bridging")
-                salt.enforceState(saltMaster, targetLiveAll, 'linux.network', true)
+                salt.enforceState(pepperEnv, targetLiveAll, 'linux.network', true)
             }
         }