fix for saltutils on ctl upgrade pipeline
Change-Id: I141ec8efb58742edeb8a0bc9dd93b5c278332d60
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 53264be..7dd2ea1 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -30,12 +30,20 @@
try {
salt.enforceState(saltMaster, 'I@salt:master', 'reclass')
} catch (Exception e) {
- common.warningMsg(" Some parts of Reclass state failed. The most probable reasons were uncommited changes. We should continue to run")
+ common.warningMsg("Some parts of Reclass state failed. The most probable reasons were uncommited changes. We should continue to run")
}
- salt.runSaltProcessStep(saltMaster, '*', 'saltutil.refresh_pillar', [], null, true)
- salt.runSaltProcessStep(saltMaster, '*', 'saltutil.sync_all', [], null, true)
+ try {
+ salt.runSaltProcessStep(saltMaster, '*', 'saltutil.refresh_pillar', [], null, true)
+ } catch (Exception e) {
+ common.warningMsg("No response from some minions. We should continue to run")
+ }
+ try {
+ salt.runSaltProcessStep(saltMaster, '*', 'saltutil.sync_all', [], null, true)
+ } catch (Exception e) {
+ common.warningMsg("No response from some minions. We should continue to run")
+ }
def _pillar = salt.getGrain(saltMaster, 'I@salt:master', 'domain')
def domain = _pillar['return'][0].values()[0].values()[0]