openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Allow mysql haproxy stanza do be customized"

This commit is contained in:
Zuul 2020-01-09 09:27:31 +00:00 committed by Gerrit Code Review
parent ac5c901609 c42c5aa678
commit 249f907340
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/haproxy.pp
View File

@ -310,6 +310,10 @@
# and if mysql cluster checking is disabled, the member options will be: "union($haproxy_member_options, ['backup'])"
# Defaults to undef
#
# [*mysql_custom_listen_options*]
# Hash to pass to the mysql haproxy listen stanza to be deepmerged with the other options
# Defaults to {}
#
# [*rabbitmq*]
# (optional) Enable or not RabbitMQ binding
# Defaults to false
@ -662,6 +666,7 @@ class tripleo::haproxy (
$mysql_clustercheck = false,
$mysql_max_conn = undef,
$mysql_member_options = undef,
$mysql_custom_listen_options = {},
$openshift_master = hiera('openshift_master_enabled', false),
$rabbitmq = false,
$etcd = hiera('etcd_enabled', false),
@ -1391,7 +1396,7 @@ class tripleo::haproxy (
}
haproxy::listen { 'mysql':
bind => $mysql_bind_opts,
options => $mysql_listen_options,
options => deep_merge($mysql_listen_options, $mysql_custom_listen_options),
collect_exported => false,
}
haproxy::balancermember { 'mysql-backup':