diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-20 12:46:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-20 12:46:51 +0000 |
| commit | e121f195c8e8e33650b5b8a6472191b3f6ea5d21 (patch) | |
| tree | d0b8025fbbf971d2c7b9effc4154645af2875a11 /manifests | |
| parent | 5a2d90b7ec7db52b226be50d874a01b74863315b (diff) | |
| parent | de735343165f0a7b3d0f63eb952b4b1756621d3e (diff) | |
Merge "make sure we start nova-compute after nova-conductor"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/nova/compute.pp | 3 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/nova/conductor.pp | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index c734906..076996a 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -38,6 +38,9 @@ class tripleo::profile::base::nova::compute ( # deploy basic bits for 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 include ::nova::network::neutron diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp index 495c92e..3d5e41e 100644 --- a/manifests/profile/pacemaker/nova/conductor.pp +++ b/manifests/profile/pacemaker/nova/conductor.pp @@ -47,6 +47,11 @@ class tripleo::profile::pacemaker::nova::conductor ( pacemaker::resource::service { $::nova::params::conductor_service_name: 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' |> } } |