From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 11 May 2015 13:22:29 +0000 (+0200)
Subject: Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker
X-Git-Tag: opnfv-6.0.0~2585^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=72a025fe7006dadcbb1d6a79392b9f2ac49fde5b;p=apex-tripleo-heat-templates.git

Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker

Change-Id: Icfe70de72eb2cf09fe2d00d9ae49baebc79e1886
---

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