openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set pacemaker default resource-stickiness"

Browse Source
This commit is contained in:
Jenkins
2015-09-16 15:41:31 +00:00
committed by Gerrit Code Review
parent f84d4e45c0 7c264b32c2
commit 13d59fd1b6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/hieradata/controller.yaml
View File

@@ -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: '*'

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@@ -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