commit 86f1a8483194533f77eaa4129def64861d31f067
author Oleg Iurchenko <oiurchenko@mirantis.com> Tue Feb 13 22:18:28 2018 +0200
committer Oleg Iurchenko <oiurchenko@mirantis.com> Wed Feb 14 13:07:35 2018 +0200
tree 3c8a713905dccf0811533e871c065353279281e9
parent 4560f3ce795b3a9045e10abf7a7122af9e7eaa38

Restart Salt minions before highstate

This patch restarts salt minions before highstates.
Without it keystone.role_present can crash.
More details here:
https://mirantis.jira.com/browse/PROD-17765

Change-Id: Ie679f933e9f99c3c25e8a417da981e534d67d7d4
Related-Prod: PROD-17765

cloud-deploy-pipeline.groovy

diff --git a/cloud-deploy-pipeline.groovy b/cloud-deploy-pipeline.groovy
index b4c6d11..16f2e97 100644
--- a/cloud-deploy-pipeline.groovy
+++ b/cloud-deploy-pipeline.groovy
@@ -380,6 +380,11 @@
                     orchestrate.installOpenstackControl(venvPepper)
                 }
 
+                // Workaround for PROD-17765 issue to prevent crashes of keystone.role_present state.
+                // More details: https://mirantis.jira.com/browse/PROD-17765
+                salt.runSaltProcessStep(venvPepper, 'I@keystone:client', 'service.restart', ['salt-minion'])
+                salt.minionsReachable(venvPepper, 'I@salt:master and *01*', 'I@keystone:client', null, 10, 6)
+
                 stage('Install OpenStack network') {
 
                     if (common.checkContains('STACK_INSTALL', 'contrail')) {