From: Yanis Guenane <yguenane@redhat.com>
Date: Mon, 13 Jul 2015 11:19:01 +0000 (+0200)
Subject: neutron-server: Remove start/sleep/stop pattern
X-Git-Tag: opnfv-6.0.0~2441^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dcc66487cda9cabc3d830c5059d95aa285ef7543;p=apex-tripleo-heat-templates.git

neutron-server: Remove start/sleep/stop pattern

Currently the bootstrap of the neutron server happens with the use of a
start/sleep/stop pattern.

Since Pacemaker doesn't mind if the service is already started let
simply start the neutron server on the $pacemaker_master node and wait
for 5 sec.

Change-Id: I894dc3305f7d6685ebcc6828e690c718a63f32bd
Closes-Bug: #1473410
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 8a31a9aa..b53346ed 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -948,12 +948,7 @@ if hiera('step') >= 4 {
     # as soon as neutron-server is started; to avoid races we want to make this
     # happen only on one node, before normal Pacemaker initialization
     # https://bugzilla.redhat.com/show_bug.cgi?id=1233061
-    exec { 'neutron-server-start-wait-stop' :
-      command   => "systemctl start neutron-server && \
-                    sleep 5s && \
-                    systemctl stop neutron-server",
-      path      => ["/usr/bin", "/usr/sbin"],
-    } ->
+    exec { '/usr/bin/systemctl start neutron-server && /usr/bin/sleep 5' : } ->
     pacemaker::resource::service { $::neutron::params::server_service:
       op_params => "start timeout=90",
       clone_params   => "interleave=true",