From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 15 May 2015 09:07:21 +0000 (+0000)
Subject: Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
X-Git-Tag: opnfv-6.0.0~2585
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9ce06559bc32c279e0905472f29def58abf5eda0;hp=12c2fe3cb4372cc94279561ebba1bba0f2d32b6a;p=apex-tripleo-heat-templates.git

Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
---

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')