Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_controller_pacemaker.pp
diff --git
a/puppet/manifests/overcloud_controller_pacemaker.pp
b/puppet/manifests/overcloud_controller_pacemaker.pp
index
930e903
..
f476f34
100644
(file)
--- 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')