summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-20 20:04:41 +0000
committerGerrit Code Review <review@openstack.org>2017-06-20 20:04:41 +0000
commit6d2bbf3a2408d96a642805b58f9a9174ba6b2ee4 (patch)
tree2a277cd0fea39ea708918c77cb827858714adef3 /manifests
parentb221948fc923b55750e5e64920ca1148cad2fd7d (diff)
parent7e6924c436e9a7581fe37ed46fa21984e4be69bd (diff)
Merge "Add maxconn parameter to MySQL / HAProxy"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/haproxy.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index 6da6dcf..436e81a 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -279,6 +279,10 @@
# (optional) Enable check via clustercheck for mysql
# Defaults to false
#
+# [*mysql_max_conn*]
+# (optional) Set the maxconn parameter for mysql
+# Defaults to undef
+#
# [*mysql_member_options*]
# The options to use for the mysql HAProxy balancer members.
# If this parameter is undefined, the actual value configured will depend
@@ -602,6 +606,7 @@ class tripleo::haproxy (
$ironic_inspector = hiera('ironic_inspector_enabled', false),
$mysql = hiera('mysql_enabled', false),
$mysql_clustercheck = false,
+ $mysql_max_conn = undef,
$mysql_member_options = undef,
$rabbitmq = false,
$etcd = hiera('etcd_enabled', false),
@@ -1314,6 +1319,7 @@ class tripleo::haproxy (
'timeout server' => '90m',
'stick-table' => 'type ip size 1000',
'stick' => 'on dst',
+ 'maxconn' => $mysql_max_conn
}
if $mysql_member_options {
$mysql_member_options_real = $mysql_member_options
@@ -1324,6 +1330,7 @@ class tripleo::haproxy (
$mysql_listen_options = {
'timeout client' => '90m',
'timeout server' => '90m',
+ 'maxconn' => $mysql_max_conn
}
if $mysql_member_options {
$mysql_member_options_real = $mysql_member_options