commit ac8abc5522ab45078d55fd6120ff77edd7a3d310
author Richard Felkl <rfelkl@mirantis.com> Thu Apr 19 07:24:04 2018 +0000
committer Gerrit Code Review <gerrit2@49259fdfccf8> Thu Apr 19 07:24:04 2018 +0000
tree b1933c1add4d75ad5db919ec5026f02565adbd8f
parent 9631355158d0512b00927abd7da66e1972aa76a3
parent 89a8f548f95f0b3acc1ca123561d4dc8e9a3e247

Merge "Revert "Fixing apache stuck for ceilometer on dedicated node.""

src/com/mirantis/mk/Orchestrate.groovy

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