vcp upgrade pipeline fix
Change-Id: I1c7b824022b7c60ef5c4383ab8939a1095f35164
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 50d2c28..df9bfd1 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -16,6 +16,12 @@
def salt = new com.mirantis.mk.Salt()
def python = new com.mirantis.mk.Python()
+def getNodeProvider(pepperEnv, name) {
+ def salt = new com.mirantis.mk.Salt()
+ def kvm = salt.getKvmMinionId(pepperEnv)
+ return salt.getReturnValues(salt.getPillar(pepperEnv, "${kvm}", "salt:control:cluster:internal:node:${name}:provider"))
+}
+
def stopServices(pepperEnv, probe, target, type) {
def openstack = new com.mirantis.mk.Openstack()
def services = []
@@ -86,7 +92,7 @@
if (SKIP_VM_RELAUNCH.toBoolean() == false) {
- def upgNodeProvider = salt.getNodeProvider(pepperEnv, test_upgrade_node)
+ def upgNodeProvider = getNodeProvider(pepperEnv, test_upgrade_node)
salt.runSaltProcessStep(pepperEnv, "${upgNodeProvider}", 'virt.destroy', ["${test_upgrade_node}.${domain}"])
salt.runSaltProcessStep(pepperEnv, "${upgNodeProvider}", 'virt.undefine', ["${test_upgrade_node}.${domain}"])