summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYanis Guenane <yanis.guenane@enovance.com>2015-05-27 15:45:37 +0200
committerYanis Guenane <yanis.guenane@enovance.com>2015-05-27 15:45:37 +0200
commitff2a35cbbc3644f4a30ffaf4889062b9f02333a4 (patch)
tree8883b55ff5eb49792d4c511c01bbdc24f0f98ecc
parent2c73a7b6ac1dcb58977a2241dd29879c074ff14a (diff)
Add keystone-glance-registry constraint
Make sure the keystone service starts before the glance-registry one. Change-Id: Ia81df13682bf556a39cc36520def48105ee3e27d
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a7aa40cb..1c221353 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -742,11 +742,21 @@ if hiera('step') >= 4 {
# Glance
pacemaker::resource::service { $::glance::params::registry_service_name :
clone_params => "interleave=true",
+ require => Pacemaker::Resource::Service[$::keystone::params::service_name],
}
pacemaker::resource::service { $::glance::params::api_service_name :
clone_params => "interleave=true",
}
+ pacemaker::constraint::base { 'keystone-then-glance-registry-constraint':
+ constraint_type => 'order',
+ first_resource => "${::keystone::params::service_name}-clone",
+ second_resource => "${::glance::params::registry_service_name}-clone",
+ first_action => 'start',
+ second_action => 'start',
+ require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name],
+ Pacemaker::Resource::Service[$::keystone::params::service_name]],
+ }
pacemaker::constraint::base { 'glance-registry-then-glance-api-constraint':
constraint_type => "order",
first_resource => "${::glance::params::registry_service_name}-clone",