diff options
| author |   Yanis Guenane <yguenane@redhat.com> | 2015-07-13 13:19:01 +0200 |
|---|---|---|
| committer | Yanis Guenane <yguenane@redhat.com> | 2015-07-13 16:38:39 +0200 |
| commit | dcc66487cda9cabc3d830c5059d95aa285ef7543 (patch) | |
| tree | a6ed90be8aa18a378d0ef9b16923a0816f97bf4a | |
| parent | 0a68adb3f7d76389d0849069630030c7f4600307 (diff) | |
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
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 7 |
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", |