summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-16 15:41:31 +0000
committerGerrit Code Review <review@openstack.org>2015-09-16 15:41:31 +0000
commit13d59fd1b62f2a3649e140df22b632e1312a870f (patch)
tree8d3cda2bb7ba5e4abe5594657ac0444663d725bf /puppet
parentf84d4e45c01cb69c4ecc8032f76f2142bfbb76e0 (diff)
parent7c264b32c255ac1b14a3020e978005d23d572204 (diff)
Merge "Set pacemaker default resource-stickiness"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml2
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
2 files changed, 4 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 48def44d..9929cfa6 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -92,6 +92,8 @@ heat::instance_user: ''
# pacemaker
pacemaker::corosync::cluster_name: 'tripleo_cluster'
pacemaker::corosync::manage_fw: false
+pacemaker::resource_defaults::defaults:
+ resource-stickiness: { value: INFINITY }
# horizon
horizon::allowed_hosts: '*'
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 862c7bdb..3a311655 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -177,6 +177,8 @@ if hiera('step') >= 2 {
if $pacemaker_master {
+ include pacemaker::resource_defaults
+
# FIXME: we should not have to access tripleo::loadbalancer class
# parameters here to configure pacemaker VIPs. The configuration
# of pacemaker VIPs could move into puppet-tripleo or we should