diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-22 08:18:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-22 08:18:48 +0000 |
| commit | 2c09ad590c05e6fd614f9ea78c43638c2a901930 (patch) | |
| tree | b90a2cb285cc68b20a1b80ceae4c4a78ead7a710 | |
| parent | 895bb718f63c8d99a3e51527a71b750841953c5a (diff) | |
| parent | 5b651e59b034347ff48a139d97d270f6dc60223d (diff) | |
Merge "Add Glance as Pacemaker resource"
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 34 |
2 files changed, 30 insertions, 5 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 1748ccdb..4f46c7fb 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -59,7 +59,6 @@ swift::proxy::account_autocreate: true # glance glance::api::pipeline: 'keystone' glance::registry::pipeline: 'keystone' -glance::registry::manage_service: true glance::backend::swift::swift_store_create_container_on_put: true glance::backend::rbd::rbd_store_user: 'openstack' diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 6daa7f87..99344532 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -411,13 +411,13 @@ if hiera('step') >= 3 { include ::glance class { 'glance::api': known_stores => [$glance_store], - manage_service => $non_pcmk_start, - enabled => $non_pcmk_start, + manage_service => false, + enabled => false, } class { '::glance::registry' : sync_db => $sync_db, - manage_service => $non_pcmk_start, - enabled => $non_pcmk_start, + manage_service => false, + enabled => false, } include join(['::glance::backend::', $glance_backend]) @@ -739,4 +739,30 @@ if hiera('step') >= 4 { } } + + # Glance + pacemaker::resource::service { $::glance::params::registry_service_name : + clone_params => "interleave=true", + } + pacemaker::resource::service { $::glance::params::api_service_name : + clone_params => "interleave=true", + } + + pacemaker::constraint::base { 'glance-registry-then-glance-api-constraint': + constraint_type => "order", + first_resource => "${::glance::params::registry_service_name}-clone", + second_resource => "${::glance::params::api_service_name}-clone", + first_action => "start", + second_action => "start", + 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", + score => "INFINITY", + require => [Pacemaker::Resource::Service[$::glance::params::registry_service_name], + Pacemaker::Resource::Service[$::glance::params::api_service_name]], + } + } #END STEP 4 |