openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Yanis Guenane 2015-07-13 13:19:01 +02:00
parent 0a68adb3f7
commit dcc66487cd
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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",