summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-11 15:22:29 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-05-14 17:47:56 +0200
commit72a025fe7006dadcbb1d6a79392b9f2ac49fde5b (patch)
tree8b8f81b0a3be2baa173dd5dd52abb77fdffaeee5 /puppet/manifests
parent2c6ea075cf0eeeea5cc7cf6ea9b654c325096d32 (diff)
Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker
Change-Id: Icfe70de72eb2cf09fe2d00d9ae49baebc79e1886
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 d9618e82..6060ad73 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')