From 72a025fe7006dadcbb1d6a79392b9f2ac49fde5b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 11 May 2015 15:22:29 +0200 Subject: Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker Change-Id: Icfe70de72eb2cf09fe2d00d9ae49baebc79e1886 --- puppet/manifests/overcloud_controller_pacemaker.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet') 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') -- cgit 1.2.3-korg