Add keystone-glance-registry constraint

Make sure the keystone service starts before the glance-registry one.

Change-Id: Ia81df13682bf556a39cc36520def48105ee3e27d

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a7aa40c..1c22135 100644 (file)
--- 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",