From 1012fe2195d9de10b805c97efa2b74405f90e63d Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Wed, 27 May 2015 15:39:22 +0200 Subject: [PATCH] Add a keystone-cinder-api constraint Make sure the keystone service starts before the cinder-api one. Change-Id: I21549c066afcf051e52fc4bba4fae2f34ad2ba4b --- puppet/manifests/overcloud_controller_pacemaker.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index a7aa40cb99..ef1022721b 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -700,12 +700,22 @@ if hiera('step') >= 4 { # Cinder pacemaker::resource::service { $::cinder::params::api_service : clone_params => "interleave=true", + require => Pacemaker::Resource::Service[$::keystone::params::service_name], } pacemaker::resource::service { $::cinder::params::scheduler_service : clone_params => "interleave=true", } pacemaker::resource::service { $::cinder::params::volume_service : } + pacemaker::constraint::base { 'keystone-then-cinder-api-constraint': + constraint_type => 'order', + first_resource => "${::keystone::params::service_name}-clone", + second_resource => "${::cinder::params::api_service}-clone", + first_action => 'start', + second_action => 'start', + require => [Pacemaker::Resource::Service[$::cinder::params::api_service], + Pacemaker::Resource::Service[$::keystone::params::service_name]], + } pacemaker::constraint::base { 'cinder-api-then-cinder-scheduler-constraint': constraint_type => "order", first_resource => "${::cinder::params::api_service}-clone",