Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Templating: Only use wsrep_provider_options when galera_extra_wsrep_p… #230

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tasks/setup_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
galera_extra_wsrep_provider_options: >
{{
galera_extra_wsrep_provider_options | combine({
'ist.recv_addr': galera_ist_recv_addr + ":" + galera_ist_recv_addr_port,
'ist.recv_addr': galera_ist_recv_addr + ":" + galera_ist_recv_addr_port|string,
'ist.recv_bind': galera_ist_recv_bind
})
}}
Expand Down
2 changes: 2 additions & 0 deletions templates/etc/mysql/conf.d/galera.cnf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ wsrep_notify_cmd='{{ galera_monitor_script_path }}/{{ galera_monitor_script_name

wsrep_node_address="{{ galera_wsrep_node_address }}"

{% if galera_extra_wsrep_provider_options is defined %}
wsrep_provider_options = "{% for item in galera_extra_wsrep_provider_options %}{% set _key = item.split(': ')[0] %}{% set _val = galera_extra_wsrep_provider_options[_key] %}{{ _key }} = {{ _val }}{% if not loop.last %}; {% endif %}{% endfor %}"
{% endif %}

[sst]
{% if mariadb_tls_files and mariadb_tls_files|length == 3 and galera_sst_tls_enabled %}
Expand Down
Loading