aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-18 21:06:13 +0000
committerGerrit Code Review <review@openstack.org>2016-07-18 21:06:13 +0000
commit1781975377912eff6480448a7ec8b4c454b727ec (patch)
tree94a7a7127a779e4d7260c733fc3c714398c081f6
parentfbdb91f9fc736b5e077608a2171a218e34ca9ba9 (diff)
parent17fb4db1ae60822fe5c684f953f5c1094ecb8adf (diff)
Merge "Remove enable_load_balancer on nonha manifest"
-rw-r--r--puppet/manifests/overcloud_controller.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a4151d03..a635ef73 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -16,8 +16,6 @@
include ::tripleo::packages
include ::tripleo::firewall
-$enable_load_balancer = hiera('enable_load_balancer', true)
-
if hiera('step') >= 2 {
# FIXME: this should only occur on the bootstrap host (ditto for db syncs)
# Create all the database schemas