cloud update pipeline fixes
PROD-19616
PROD-19617
Change-Id: I909e0fa19c28696fe671e8ca4c33d881574a9bdb
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 21134a2..2f91865 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -107,10 +107,17 @@
salt.runSaltProcessStep(pepperEnv, "${test_upgrade_node}*", 'saltutil.sync_all', [])
}
+ stateRun(pepperEnv, "${test_upgrade_node}*", ['linux.network.proxy'])
+ try {
+ salt.runSaltProcessStep(pepperEnv, "${test_upgrade_node}*", 'state.sls', ["salt.minion.base"], null, true, 60)
+ } catch (Exception e) {
+ common.warningMsg(e)
+ }
+
stateRun(pepperEnv, "${test_upgrade_node}*", ['linux', 'openssh'])
try {
- salt.runSaltProcessStep(master, "${test_upgrade_node}*", 'state.sls', ["salt.minion"], null, true, 60)
+ salt.runSaltProcessStep(pepperEnv, "${test_upgrade_node}*", 'state.sls', ["salt.minion"], null, true, 60)
} catch (Exception e) {
common.warningMsg(e)
}
@@ -263,6 +270,13 @@
// salt '*' saltutil.sync_all
salt.runSaltProcessStep(pepperEnv, upgrade_general_target, 'saltutil.sync_all', [])
+ stateRun(pepperEnv, upgrade_general_target, ['linux.network.proxy'])
+ try {
+ salt.runSaltProcessStep(pepperEnv, upgrade_general_target, 'state.sls', ["salt.minion.base"], null, true, 60)
+ } catch (Exception e) {
+ common.warningMsg(e)
+ }
+
if (OPERATING_SYSTEM_RELEASE_UPGRADE.toBoolean() == false) {
try {
@@ -302,7 +316,7 @@
common.warningMsg(e)
}
try {
- salt.runSaltProcessStep(master, upgrade_general_target, 'state.sls', ["salt.minion"], null, true, 60)
+ salt.runSaltProcessStep(pepperEnv, upgrade_general_target, 'state.sls', ["salt.minion"], null, true, 60)
} catch (Exception e) {
common.warningMsg(e)
}