Revert "Fixing apache stuck for ceilometer on dedicated node."
This patch will completely broke installation when ceilometer is installed only on node that matches following pattern '*01*'
Also the approach is not clear at all, as if apache wasn't restarted after config changes it is a bug in the formula, we need to fix there instead of doing such workarounds.
This reverts commit bccc2166b536263c79b597722d09cbc492804b6c.
Change-Id: If6c64c440cd415308a6bcaf39485a8ac5887b925
diff --git a/src/com/mirantis/mk/Orchestrate.groovy b/src/com/mirantis/mk/Orchestrate.groovy
index 712fee6..664871f 100644
--- a/src/com/mirantis/mk/Orchestrate.groovy
+++ b/src/com/mirantis/mk/Orchestrate.groovy
@@ -356,16 +356,8 @@
// Install ceilometer server
if (salt.testTarget(master, 'I@ceilometer:server')) {
- 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)
- }
+ salt.enforceState(master, 'I@ceilometer:server and *01*', 'ceilometer')
+ salt.enforceState(master, 'I@ceilometer:server', 'ceilometer')
}
// Install aodh server