Merge "Make load balancer deployment optional via template param"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 Nov 2015 10:37:34 +0000 (10:37 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 Nov 2015 10:37:35 +0000 (10:37 +0000)
commitfdc2359e4515dfa50048b3b6cd4896ef4744cc5f
tree2f0057684098c2593a8d29954c165453763d9bc5
parenta8bf039544ebf9b9e41a871445b6661182ad7044
parent2a6da17a3a62d2e05907e32eb78d37d22714ea7a
Merge "Make load balancer deployment optional via template param"
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp