aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-01 14:05:09 +0000
committerGerrit Code Review <review@openstack.org>2015-07-01 14:05:09 +0000
commitc167e9278b5a91957876ad9a204c8af8c208522c (patch)
tree3bbdee00f9d72c93e02d6453d505a3383dd20727
parent2e922fdb33a4e9327c86c75806be6312e0a262e3 (diff)
parent066130bce1cfc8e9c8eca238b53d4fd8aef51252 (diff)
Merge "Add special handling of neutron-server service startup to fix race"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a57465c0..3d693313 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -842,6 +842,16 @@ if hiera('step') >= 4 {
}
# Neutron
+ # NOTE(gfidente): Neutron will try to populate the database with some data
+ # 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"],
+ } ->
pacemaker::resource::service { $::neutron::params::server_service:
op_params => "start timeout=90",
clone_params => "interleave=true",