openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Allow passing aditional arguments to wsrep_provider_options"

This commit is contained in:
Zuul 2022-10-13 21:36:44 +00:00 committed by Gerrit Code Review
parent 9842277217 171814ebba
commit 4abef13c85
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -200,6 +200,10 @@
# (optional) Recover gcache on galera startup.
# Defaults to false
#
# [*provider_options*]
# (optional) Allows passing extra options to wsrep_provider_options.
# Defaults to undef
#
class tripleo::profile::pacemaker::database::mysql_bundle (
$mysql_docker_image = undef,
$control_port = 3123,
@ -239,6 +243,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$force_ocf = false,
$gcache_size = undef,
$gcache_recover = false,
$provider_options = undef,
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
@ -356,10 +361,15 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$mysqld_options_sst = {}
}
}
if $ipv6 {
$wsrep_provider_options = "${gcache_options}gmcast.listen_addr=tcp://[::]:4567;${tls_options}"
if $provider_options {
$extra_options = "${provider_options};"
} else {
$wsrep_provider_options = "${gcache_options}gmcast.listen_addr=tcp://${gmcast_listen_addr}:4567;${tls_options}"
$extra_options = ''
}
if $ipv6 {
$wsrep_provider_options = "${extra_options}${gcache_options}gmcast.listen_addr=tcp://[::]:4567;${tls_options}"
} else {
$wsrep_provider_options = "${extra_options}${gcache_options}gmcast.listen_addr=tcp://${gmcast_listen_addr}:4567;${tls_options}"
}
$mysqld_options_mysqld = {

8
releasenotes/notes/mysql_bundle_options-b5ecf4c4472cca01.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
Add support for injecting arbitrary arguments into the wsrep_provider_options
string.
Operators should be extremely careful in doing so as there is no validation
or syntax checking whatsoever.