summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-14 09:06:32 +0000
committerGerrit Code Review <review@openstack.org>2015-07-14 09:06:32 +0000
commit53810fd7c032a33afcdc6a8baaf463f4d617bc7d (patch)
treedcba9ad5de1a42eee03550fb6aa73b3bef53597a /puppet/manifests
parent1b237fa9a7797a2247c24b0387a28d65e97e1f4e (diff)
parentdcc66487cda9cabc3d830c5059d95aa285ef7543 (diff)
Merge "neutron-server: Remove start/sleep/stop pattern"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp7
1 files changed, 1 insertions, 6 deletions
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",