Merge "Make load balancer deployment optional via template param"

diff --cc puppet/controller.yaml
index 9792e7d,94bf764..861b29a
--- 1/puppet/controller.yaml
--- 2/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 f758c55,3652aee..afbdd19
--- 1/puppet/manifests/overcloud_controller.pp
--- 2/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'), {})

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge