Merge "Add openstack-rabbitmq-upgrade.groovy pipeline" into release/proposed/2019.2.0
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index c34215d..bff2589 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -479,8 +479,13 @@
}
// update minions certs
+ // call for `salt.minion.ca` state on related nodes to make sure
+ // mine was updated with required data after salt-minion/salt-master restart salt:minion:ca
+ salt.enforceState(venvPepper, "I@salt:minion:ca", 'salt.minion.ca', true)
salt.enforceState(venvPepper, "I@salt:minion", 'salt.minion.cert', true)
+ // run `salt.minion` to refresh all minion configs (for example _keystone.conf)
+ salt.enforceState([saltId: venvPepper, target: "I@salt:minion ${extra_tgt}", state: ['salt.minion'], read_timeout: 60, retries: 2])
// Retry needed only for rare race-condition in user appearance
common.infoMsg('Perform: updating users and keys')
salt.enforceState(venvPepper, "I@linux:system", 'linux.system.user', true)