openstack/puppet-tripleo
Code Issues Proposed changes

Merge "make sure we start nova-compute after nova-conductor"

Browse Source
This commit is contained in:
Jenkins 2016-07-20 12:46:51 +00:00 committed by Gerrit Code Review
commit e121f195c8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/base/nova/compute.pp
View File

@ -38,6 +38,9 @@ class tripleo::profile::base::nova::compute (
# deploy basic bits for nova-compute # deploy basic bits for nova-compute
include ::nova::compute include ::nova::compute
# If Service['nova-conductor'] is in catalog, make sure we start it
# before nova-compute.
Service<| title == 'nova-conductor' |> -> Service['nova-compute']
# deploy bits to connect nova compute to neutron # deploy bits to connect nova compute to neutron
include ::nova::network::neutron include ::nova::network::neutron

5
manifests/profile/pacemaker/nova/conductor.pp
View File

@ -47,6 +47,11 @@ class tripleo::profile::pacemaker::nova::conductor (
pacemaker::resource::service { $::nova::params::conductor_service_name: pacemaker::resource::service { $::nova::params::conductor_service_name:
clone_params => 'interleave=true', clone_params => 'interleave=true',
} }
# If Service['nova-compute'] is in catalog, make sure we start it after
# nova-conductor pcmk resource.
# Also make sure to restart nova-compute if nova-conductor pcmk resource changed
# the state, since nova-compute is deployed at a previous step.
Pacemaker::Resource::Service[$::nova::params::conductor_service_name] ~> Service<| title == 'nova-compute' |>
} }
} }