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

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 1b088a8..2b4e205 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -90,8 +90,10 @@ if hiera('step') >= 2 {
     config_file => $mysql_config_file,
     override_options => {
       'mysqld' => {
-        'bind-address' => hiera('controller_host')
-      }
+        'bind-address' => hiera('controller_host'),
+        'max_connections' => '1024',
+        'open_files_limit' => '-1',
+      },
     }
   }
 

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 6060ad7..f476f34 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -64,12 +64,12 @@ if hiera('step') >= 1 {
     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 <| |>
 
 }
 
@@ -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'],
@@ -157,6 +157,8 @@ if hiera('step') >= 2 {
       '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',