Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
authorJenkins <jenkins@review.openstack.org>
Fri, 15 May 2015 09:07:21 +0000 (09:07 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 15 May 2015 09:07:21 +0000 (09:07 +0000)
commit9ce06559bc32c279e0905472f29def58abf5eda0
treecc8bcbf955e1083cc63d9fe36fc6542a45abf21f
parent12c2fe3cb4372cc94279561ebba1bba0f2d32b6a
parent72a025fe7006dadcbb1d6a79392b9f2ac49fde5b
Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"
puppet/manifests/overcloud_controller_pacemaker.pp