aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-15 09:07:21 +0000
committerGerrit Code Review <review@openstack.org>2015-05-15 09:07:21 +0000
commit9ce06559bc32c279e0905472f29def58abf5eda0 (patch)
treecc8bcbf955e1083cc63d9fe36fc6542a45abf21f /puppet/manifests
parent12c2fe3cb4372cc94279561ebba1bba0f2d32b6a (diff)
parent72a025fe7006dadcbb1d6a79392b9f2ac49fde5b (diff)
Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 930e9030..f476f348 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -38,6 +38,7 @@ if hiera('step') >= 1 {
controller_hosts => $controller_node_ips,
controller_hosts_names => $controller_node_names,
manage_vip => false,
+ haproxy_service_manage => false,
}
$pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')