summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-06-23 13:41:19 +0200
committermarios <marios@redhat.com>2015-06-23 19:37:03 +0300
commit066130bce1cfc8e9c8eca238b53d4fd8aef51252 (patch)
tree86c51fa153ae584da53f67915fc072f42e91b911 /puppet
parente156bd1bb63389e1af0ee13c85f74f55054a40ad (diff)
Add special handling of neutron-server service startup to fix race
Neutron will populate the database with some data as soon as the neutron-server service is started; we want this to happen from a single node before normal Pacemaker initialization. Change-Id: I422972502fbb10ddae3201464bbd6885749de31e Closes-Bug: 1467904 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1233061
Diffstat (limited to 'puppet')
-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 ed4f3512..8ad7239f 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -839,6 +839,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",