diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-28 12:02:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-28 12:02:33 +0000 |
| commit | aa333f18a60bbcc7b677702a55c7c66a5bc400f8 (patch) | |
| tree | a84428e6266a3fcb21f516a64c62feb28b60656d /puppet/manifests | |
| parent | 48908b744c6cd47eefaee631a7ecce63f75e9958 (diff) | |
| parent | ff2a35cbbc3644f4a30ffaf4889062b9f02333a4 (diff) | |
Merge "Add keystone-glance-registry constraint"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b496e3c9..a1c7d0f2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -743,11 +743,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", |