diff options
author | 2015-09-23 13:23:25 +0000 | |
---|---|---|
committer | 2015-09-23 13:23:25 +0000 | |
commit | 92fd515d2d544521b6c18e1ad63959c781c29672 (patch) | |
tree | fd07b0e16642645af60250b9d36df5c79f5940b2 /puppet | |
parent | 611ba701609778986c3265b05d5c02afc55c711b (diff) | |
parent | 84d5e6aaeea41799040f406163eff3226b6cd4d2 (diff) |
Merge "Add redis ordering with ceilometer-central"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 63c44f82..7615290a 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -1271,6 +1271,22 @@ if hiera('step') >= 4 { clone_params => 'interleave=true', resource_params => 'startdelay=10', } + # Fedora doesn't know `require-all` parameter for constraints yet + if $::operatingsystem == 'Fedora' { + $redis_ceilometer_constraint_params = undef + } else { + $redis_ceilometer_constraint_params = 'require-all=false' + } + pacemaker::constraint::base { 'redis-then-ceilometer-central-constraint': + constraint_type => 'order', + first_resource => "redis-master", + second_resource => "${::ceilometer::params::agent_central_service_name}-clone", + first_action => 'promote', + second_action => 'start', + constraint_params => $redis_ceilometer_constraint_params, + require => [Pacemaker::Resource::Ocf['redis'], + Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name]], + } pacemaker::constraint::base { 'keystone-then-ceilometer-central-constraint': constraint_type => 'order', first_resource => "${::keystone::params::service_name}-clone", |