diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-28 13:44:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-28 13:44:31 +0000 |
| commit | 341fae89f51f7296168d4cc0119b8afab2fa4a6b (patch) | |
| tree | 7df591f6781593d63cde7d64951e3df571e7a43e /puppet | |
| parent | 93f4097e4de41c97d6fa000f39f2d3f1a9ce1f2b (diff) | |
| parent | 62eeedbd6b963a8b31dcc1257077a570ab3f58d0 (diff) | |
Merge "Fix colocation order to match ref-arch"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 5b5854da..9e80c1e1 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -784,9 +784,9 @@ if hiera('step') >= 4 { require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name], Pacemaker::Resource::Service[$::glance::params::api_service_name]], } - pacemaker::constraint::colocation { 'glance-registry-with-glance-api-colocation': - source => "${::glance::params::registry_service_name}-clone", - target => "${::glance::params::api_service_name}-clone", + pacemaker::constraint::colocation { 'glance-api-with-glance-registry-colocation': + source => "${::glance::params::api_service_name}-clone", + target => "${::glance::params::registry_service_name}-clone", score => "INFINITY", require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name], Pacemaker::Resource::Service[$::glance::params::api_service_name]], |