openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow setting additional galera WSREP options"

Browse Source
This commit is contained in:
Zuul 2020-02-19 12:56:40 +00:00 committed by Gerrit Code Review
commit 65b0110ebc
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/mariadb/defaults/main.yml
View File

@ -69,6 +69,11 @@ mariadb_extra_volumes: "{{ default_extra_volumes }}"
######################################## ########################################
mariadb_service: "{{ mariadb_services['mariadb'] }}" mariadb_service: "{{ mariadb_services['mariadb'] }}"
###############
# WSREP options
###############
mariadb_wsrep_extra_provider_options: []
#################### ####################
# Backups # Backups
#################### ####################

4
ansible/roles/mariadb/templates/galera.cnf.j2
View File

@ -32,9 +32,9 @@ wsrep_cluster_address=gcomm://{% if (groups['mariadb'] | length) > 1 %}{% for ho
# FIXME(jeffrey4l): Revert when using C8 (CentOS+Ussuri) # FIXME(jeffrey4l): Revert when using C8 (CentOS+Ussuri)
# Use [::] to avoid galera issue. # Use [::] to avoid galera issue.
# for more info see https://github.com/codership/galera/issues/534#issuecomment-472607544 # for more info see https://github.com/codership/galera/issues/534#issuecomment-472607544
wsrep_provider_options=gmcast.listen_addr=tcp://[::]:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }} wsrep_provider_options=gmcast.listen_addr=tcp://[::]:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }};{% for option in mariadb_wsrep_extra_provider_options %}{{ option }}{% if not loop.last %};{% endif %}{% endfor %}
{% else %} {% else %}
wsrep_provider_options=gmcast.listen_addr=tcp://{{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }} wsrep_provider_options=gmcast.listen_addr=tcp://{{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }};ist.recv_addr={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_ist_port }};{% for option in mariadb_wsrep_extra_provider_options %}{{ option }}{% if not loop.last %};{% endif %}{% endfor %}
{% endif %} {% endif %}
wsrep_node_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }} wsrep_node_address={{ api_interface_address | put_address_in_context('url') }}:{{ mariadb_wsrep_port }}

6
etc/kolla/globals.yml
View File

@ -362,6 +362,12 @@
# to configure IPv6 in RabbitMQ server. # to configure IPv6 in RabbitMQ server.
#rabbitmq_server_additional_erl_args: "" #rabbitmq_server_additional_erl_args: ""
#################
# MariaDB options
#################
# List of additional WSREP options
#mariadb_wsrep_extra_provider_options: []
####################### #######################
# External Ceph options # External Ceph options
####################### #######################

5
releasenotes/notes/mariadb_wsrep_extra_provider_options-27c2804e4505aed1.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Introduce new configuration variable `mariadb_wsrep_extra_provider_options`
allowing users to set additional WSREP options.