Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"

diff --combined puppet/manifests/overcloud_controller_pacemaker.pp
index 930e903,6060ad7..f476f34
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -38,6 -38,7 +38,7 @@@ if hiera('step') >= 1 
      controller_hosts       => $controller_node_ips,
      controller_hosts_names => $controller_node_names,
      manage_vip             => false,
+     haproxy_service_manage => false,
    }
  
    $pacemaker_cluster_members = regsubst(hiera('controller_node_ips'), ',', ' ', 'G')
@@@ -63,12 -64,12 +64,12 @@@
      pacemaker::resource::ip { 'public_vip':
        ip_address => $public_vip,
      }
 -    pacemaker::resource::systemd { 'haproxy':
 +    pacemaker::resource::service { 'haproxy':
        clone => true,
      }
    }
  
 -  Class['::pacemaker::corosync'] -> Pacemaker::Resource::Systemd <| |>
 +  Class['::pacemaker::corosync'] -> Pacemaker::Resource::Service <| |>
  
  }
  
@@@ -93,7 -94,7 +94,7 @@@ if hiera('step') >= 2 
      $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
      if downcase(hiera('bootstrap_nodeid')) == $::hostname {
  
 -      pacemaker::resource::systemd { 'mongod' :
 +      pacemaker::resource::service { 'mongod' :
          options => "op start timeout=120s",
          clone   => true,
          before  => Exec['mongodb-ready'],
@@@ -156,8 -157,6 +157,8 @@@
        'query_cache_size'              => '0',
        'query_cache_type'              => '0',
        'bind-address'                  => hiera('controller_host'),
 +      'max_connections'               => '1024',
 +      'open_files_limit'              => '-1',
        'wsrep_provider'                => '/usr/lib64/galera/libgalera_smm.so',
        'wsrep_cluster_name'            => 'galera_cluster',
        'wsrep_slave_threads'           => '1',