commit 8440b4eadf2cabfaebefa169fea253d222fe7619
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon May 20 11:05:00 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon May 20 11:05:00 2019 +0000
tree 20dbd70729b88bf67d51673413194fda0b0aa01c
parent af3a220e19721555a8d79b0212e8290d51b19c65
parent e8910114a9a0d505e47bfef8cdd4cf6cc21e309d

Merge "Run salt.minion after salt.minion.cert" into release/proposed/2019.2.0

upgrade-mcp-release.groovy

diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index 1e1d290..bff2589 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -484,6 +484,8 @@
                 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)