diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-09 04:45:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-09 04:45:23 +0000 |
commit | adc02fd625b6be1ee6529a4c7646e62d793a206a (patch) | |
tree | c34ce515e36f8e49d1524da378158c629be760fa /manifests/profile/pacemaker/sahara.pp | |
parent | c68e7429202722ef8b5bc2904b5e8e864dfd69cb (diff) | |
parent | 187cd52b04d3bfcb3c24bd6774fac4494a279997 (diff) |
Merge "Split Sahara pacemaker roles into separate services"
Diffstat (limited to 'manifests/profile/pacemaker/sahara.pp')
-rw-r--r-- | manifests/profile/pacemaker/sahara.pp | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/manifests/profile/pacemaker/sahara.pp b/manifests/profile/pacemaker/sahara.pp index 04b4edf..e6e5117 100644 --- a/manifests/profile/pacemaker/sahara.pp +++ b/manifests/profile/pacemaker/sahara.pp @@ -45,37 +45,5 @@ class tripleo::profile::pacemaker::sahara ( $pacemaker_master = false } - include ::tripleo::profile::base::sahara-api - class { '::tripleo::profile::base::sahara-engine': - sync_db => $pacemaker_master, - } - - if $step >= 5 and $pacemaker_master { - # Sahara - pacemaker::resource::service { $::sahara::params::api_service_name : - clone_params => 'interleave=true', - require => Pacemaker::Resource::Ocf['openstack-core'], - } - pacemaker::resource::service { $::sahara::params::engine_service_name : - clone_params => 'interleave=true', - } - pacemaker::constraint::base { 'keystone-then-sahara-api-constraint': - constraint_type => 'order', - first_resource => 'openstack-core-clone', - second_resource => "${::sahara::params::api_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name], - Pacemaker::Resource::Ocf['openstack-core']], - } - pacemaker::constraint::base { 'sahara-api-then-sahara-engine-constraint': - constraint_type => 'order', - first_resource => "${::sahara::params::api_service_name}-clone", - second_resource => "${::sahara::params::engine_service_name}-clone", - first_action => 'start', - second_action => 'start', - require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name], - Pacemaker::Resource::Service[$::sahara::params::engine_service_name]], - } - } + include ::tripleo::profile::base::sahara } |