From de735343165f0a7b3d0f63eb952b4b1756621d3e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 5 Jul 2016 15:26:30 -0400 Subject: make sure we start nova-compute after nova-conductor When nova-compute and nova-conductor are collocated, we need to make sure nova-conductor starts before nova-compute otherwise nova-compute will just fail to start. Change-Id: Icc3ed768af2a08e2db78d9c9278d309a62d26850 --- manifests/profile/pacemaker/nova/conductor.pp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'manifests/profile/pacemaker') 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' |> } } -- cgit 1.2.3-korg