Increase global maxconn to 10000 and remove per-instance limit

The per-instance limit to 150 can easily be reached for the
database when OpenStack services are running on hosts with many
CPUs. The global maxconn is increased as per astapor. See [1].

1. https://bugzilla.redhat.com/show_bug.cgi?id=1218322

Change-Id: Ia9258372ca4f707929f11097193a91c138069725

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 4250ac9..6ded676 100644 (file)
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -27,6 +27,10 @@
 #  Will be passed as value for service_manage to haproxy module.
 #  Defaults to true
 #
+# [*haproxy_global_maxconn*]
+#  The value to use as maxconn in the haproxy global config section.
+#  Defaults to 10000
+#
 # [*controller_host*]
 #  (Deprecated)Host or group of hosts to load-balance the services
 #  Can be a string or an array.
@@ -153,6 +157,7 @@ class tripleo::loadbalancer (
   $public_virtual_ip,
   $manage_vip                = true,
   $haproxy_service_manage    = true,
+  $haproxy_global_maxconn    = 10000,
   $controller_host           = undef,
   $controller_hosts          = undef,
   $controller_hosts_names    = undef,
@@ -247,13 +252,12 @@ class tripleo::loadbalancer (
       'user'    => 'haproxy',
       'group'   => 'haproxy',
       'daemon'  => '',
-      'maxconn' => '4000',
+      'maxconn' => $haproxy_global_maxconn,
     },
     defaults_options => {
       'mode'    => 'tcp',
       'log'     => 'global',
       'retries' => '3',
-      'maxconn' => '150',
       'option'  => [ 'tcpka', 'tcplog' ],
       'timeout' => [ 'http-request 10s', 'queue 1m', 'connect 10s', 'client 1m', 'server 1m', 'check 10s' ],
     },