File tree Expand file tree Collapse file tree 5 files changed +13
-5
lines changed Expand file tree Collapse file tree 5 files changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ mariadb_services:
21
21
backend_tcp_extra :
22
22
- " option srvtcpka"
23
23
- " timeout server 3600s"
24
- - " option {% if enable_mariadb_clustercheck | bool %}httpchk{% else %}mysql-check user haproxy post-41{% endif %}"
24
+ - " {% if enable_mariadb_clustercheck | bool %}option httpchk{% else %}{% if kolla_base_distro != 'debian' %}option mysql-check user haproxy post-41{% endif %} {% endif %}"
25
25
custom_member_list : " {{ internal_haproxy_members.split(';') }}"
26
26
mariadb_external_lb :
27
27
enabled : " {{ enable_external_mariadb_load_balancer|bool }}"
@@ -57,8 +57,8 @@ database_max_timeout: 120
57
57
# ###################
58
58
# HAProxy
59
59
# ###################
60
- internal_haproxy_members : " {% for host in mariadb_default_database_shard_hosts %} server {{ hostvars[host].ansible_facts.hostname }} {{ 'api' | kolla_address(host) }}:{{ mariadb_port }} check {% if enable_mariadb_clustercheck | bool %}port {{ mariadb_clustercheck_port }}{% endif %} inter 2000 rise 2 fall 5{% if not loop.first %} backup{% endif %};{% endfor %}"
61
- external_haproxy_members : " {% for host in mariadb_default_database_shard_hosts %} server {{ host }} {{ host }}:{{ mariadb_port }} check {% if enable_mariadb_clustercheck | bool %}port {{ mariadb_clustercheck_port }}{% endif %} inter 2000 rise 2 fall 5{% if not loop.first %} backup{% endif %};{% endfor %}"
60
+ internal_haproxy_members : " {% for host in mariadb_default_database_shard_hosts %} server {{ hostvars[host].ansible_facts.hostname }} {{ 'api' | kolla_address(host) }}:{{ mariadb_port }} check {% if enable_mariadb_clustercheck | bool %}port {{ mariadb_clustercheck_port }}{% else %}{% if kolla_base_distro == 'debian' %}port {{ mariadb_port }}{% endif %}{% endif %} inter 2000 rise 2 fall 5{% if not loop.first %} backup{% endif %};{% endfor %}"
61
+ external_haproxy_members : " {% for host in mariadb_default_database_shard_hosts %} server {{ host }} {{ host }}:{{ mariadb_port }} check {% if enable_mariadb_clustercheck | bool %}port {{ mariadb_clustercheck_port }}{% else %}{% if kolla_base_distro == 'debian' %}port {{ mariadb_port }}{% endif %}{% endif %} inter 2000 rise 2 fall 5{% if not loop.first %} backup{% endif %};{% endfor %}"
62
62
63
63
# ###################
64
64
# Docker
Original file line number Diff line number Diff line change 98
98
- inventory_hostname in groups[item.value.group]
99
99
- item.value.enabled | bool
100
100
- not enable_mariadb_clustercheck | bool
101
+ - kolla_base_distro != 'debian'
101
102
with_dict : " {{ mariadb_services }}"
102
103
notify :
103
104
- restart mariadb
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ wsrep_node_name={{ ansible_facts.hostname }}
40
40
wsrep_sst_method={{ sst_method }}
41
41
wsrep_sst_auth={{ database_user }}:{{ database_password }}
42
42
wsrep_slave_threads=4
43
- {% if not enable_mariadb_clustercheck | bool %}
43
+ {% if not enable_mariadb_clustercheck | bool and kolla_base_distro != 'debian' %}
44
44
wsrep_notify_cmd=/usr/local/bin/wsrep-notify.sh
45
45
{% endif %}
46
46
wsrep_on = ON
Original file line number Diff line number Diff line change 7
7
"dest": "/etc/{{ mysql_dir }}/my.cnf",
8
8
"owner": "mysql",
9
9
"perm": "0600"
10
- }{% if not enable_mariadb_clustercheck | bool %} ,
10
+ }{% if not enable_mariadb_clustercheck | bool and kolla_base_distro != 'debian' %} ,
11
+ }
11
12
{
12
13
"source": "{{ container_config_directory }}/wsrep-notify.sh",
13
14
"dest": "/usr/local/bin/wsrep-notify.sh",
Original file line number Diff line number Diff line change
1
+ ---
2
+ fixes :
3
+ - |
4
+ Fixes an issue on Debian with single node MariaDB deployments with
5
+ HAProxy disabled.
6
+ See `bug 1947534 <https://launchpad.net/bugs/1947534>`__ for details.
You can’t perform that action at this time.
0 commit comments