Merge "Add powerful generic HTTP methods (2nd try)"
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 664871f..712fee6 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -356,8 +356,16 @@
// Install ceilometer server
if (salt.testTarget(master, 'I@ceilometer:server')) {
- salt.enforceState(master, 'I@ceilometer:server and *01*', 'ceilometer')
- salt.enforceState(master, 'I@ceilometer:server', 'ceilometer')
+ common.retry(3,5){
+ salt.enforceState(master, 'I@ceilometer:server and *01*', 'ceilometer')
+ salt.runSaltProcessStep(master, 'I@ceilometer:server and *01*', 'service.restart', ['apache2'])
+ sleep(30)
+ }
+ common.retry(3,5){
+ salt.enforceState(master, 'I@ceilometer:server and not *01*', 'ceilometer')
+ salt.runSaltProcessStep(master, 'I@ceilometer:server and not *01*', 'service.restart', ['apache2'])
+ sleep(30)
+ }
}
// Install aodh server