openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "pacemaker: run neutron-server-start-wait-stop only at step 4"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 18:14:06 +00:00 committed by Gerrit Code Review
commit f93697e723
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -1053,15 +1053,32 @@ if hiera('step') >= 4 {
Pacemaker::Resource::Service[$::glance::params::api_service_name]], Pacemaker::Resource::Service[$::glance::params::api_service_name]],
} }
# Neutron if hiera('step') == 4 {
# NOTE(gfidente): Neutron will try to populate the database with some data # Neutron
# as soon as neutron-server is started; to avoid races we want to make this # NOTE(gfidente): Neutron will try to populate the database with some data
# happen only on one node, before normal Pacemaker initialization # as soon as neutron-server is started; to avoid races we want to make this
# https://bugzilla.redhat.com/show_bug.cgi?id=1233061 # happen only on one node, before normal Pacemaker initialization
exec { '/usr/bin/systemctl start neutron-server && /usr/bin/sleep 5' : } -> # https://bugzilla.redhat.com/show_bug.cgi?id=1233061
pacemaker::resource::service { $::neutron::params::server_service: # NOTE(emilien): we need to run this Exec only at Step 4 otherwise this exec
clone_params => 'interleave=true', # will try to start the service while it's already started by Pacemaker
require => Pacemaker::Resource::Service[$::keystone::params::service_name], # It would result to a deployment failure since systemd would return 1 to Puppet
# and the overcloud would fail to deploy (6 would be returned).
# This conditional prevents from a race condition during the deployment.
# https://bugzilla.redhat.com/show_bug.cgi?id=1290582
exec { 'neutron-server-systemd-start-sleep' :
command => 'systemctl start neutron-server && /usr/bin/sleep 5',
path => '/usr/bin',
unless => '/sbin/pcs resource show neutron-server',
} ->
pacemaker::resource::service { $::neutron::params::server_service:
clone_params => 'interleave=true',
require => Pacemaker::Resource::Service[$::keystone::params::service_name]
}
} else {
pacemaker::resource::service { $::neutron::params::server_service:
clone_params => 'interleave=true',
require => Pacemaker::Resource::Service[$::keystone::params::service_name]
}
} }
if hiera('neutron::enable_l3_agent', true) { if hiera('neutron::enable_l3_agent', true) {
pacemaker::resource::service { $::neutron::params::l3_agent_service: pacemaker::resource::service { $::neutron::params::l3_agent_service: