From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 26 Nov 2015 10:37:34 +0000 (+0000)
Subject: Merge "Make load balancer deployment optional via template param"
X-Git-Tag: opnfv-6.0.0~2283
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fdc2359e4515dfa50048b3b6cd4896ef4744cc5f;p=apex-tripleo-heat-templates.git

Merge "Make load balancer deployment optional via template param"
---

fdc2359e4515dfa50048b3b6cd4896ef4744cc5f
diff --cc puppet/controller.yaml
index 9792e7dc,94bf764b..861b29a8
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@@ -835,10 -827,9 +839,11 @@@ resources
          keystone_ec2_uri: { get_param: [EndpointMap, KeystoneEC2, uri] }
          enable_fencing: {get_param: EnableFencing}
          enable_galera: {get_param: EnableGalera}
+         enable_load_balancer: {get_param: EnableLoadBalancer}
          enable_ceph_storage: {get_param: EnableCephStorage}
          enable_swift_storage: {get_param: EnableSwiftStorage}
 +        manage_firewall: {get_param: ManageFirewall}
 +        purge_firewall_rules: {get_param: PurgeFirewallRules}
          mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
          mysql_max_connections: {get_param: MysqlMaxConnections}
          mysql_root_password: {get_param: MysqlRootPassword}
diff --cc puppet/manifests/overcloud_controller.pp
index f758c55a,3652aee5..afbdd19b
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@@ -14,8 -14,9 +14,10 @@@
  # under the License.
  
  include ::tripleo::packages
 +include ::tripleo::firewall
  
+ $enable_load_balancer = hiera('enable_load_balancer', true)
+ 
  if hiera('step') >= 1 {
  
    create_resources(sysctl::value, hiera('sysctl_settings'), {})