commit 9bf666cc4b1e59fb09b53302a49f51b3f18ed74e
author Marek Celoud <mceloud@mirantis.com> Wed Apr 12 18:28:48 2017 +0200
committer Tomas Kukral <tkukral@mirantis.com> Thu Apr 13 11:05:22 2017 +0000
tree f1bd627a66358f2e6b7ed4844894f8d95e6251e1
parent 1a09ab0bfca24792f8ccb0dc7200fe1358201fbf

fix keystone

Change-Id: I780908a55a7d42286f8475430fa6496c6232baef

lab-pipeline.groovy

diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 5b7cc11..ae22301 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -308,7 +308,10 @@
                     // populate keystone services/tenants/roles/users
 
                     // keystone:client must be called locally
-                    salt.runSaltProcessStep(saltMaster, 'I@keystone:client', 'cmd.run', ['salt-call state.sls keystone.client'], null, true)
+                    //salt.runSaltProcessStep(saltMaster, 'I@keystone:client', 'cmd.run', ['salt-call state.sls keystone.client'], null, true)
+                    salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'service.restart', ['apache2'])
+                    salt.enforceState(saltMaster, 'I@keystone:client', 'keystone.client', true)
+                    salt.enforceState(saltMaster, 'I@keystone:client', 'keystone.client', true)
                     salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; keystone service-list'], null, true)
 
                     // Install glance and ensure glusterfs clusters