From d7a9be84d41ea67b96fb89bb485d73296e1b2d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Wed, 14 Apr 2021 11:05:59 +0200
Subject: [PATCH] mariadb: Disable wsrep-notify script if clustercheck enabled
Change-Id: Id16ec7d7b57630ae20430675c4a196e63ca8d4a5
---
ansible/roles/mariadb/tasks/config.yml | 1 +
ansible/roles/mariadb/templates/galera.cnf.j2 | 2 ++
ansible/roles/mariadb/templates/mariadb.json.j2 | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index 5e6238148..2e9ceb75f 100644
--- a/ansible/roles/mariadb/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@@ -91,6 +91,7 @@
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
+ - not enable_mariadb_clustercheck | bool
with_dict: "{{ mariadb_services }}"
notify:
- restart mariadb
diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 023f824b4..e1f53c098 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -40,7 +40,9 @@ wsrep_node_name={{ ansible_hostname }}
wsrep_sst_method={{ sst_method }}
wsrep_sst_auth={{ database_user }}:{{ database_password }}
wsrep_slave_threads=4
+{% if not enable_mariadb_clustercheck | bool %}
wsrep_notify_cmd=/usr/local/bin/wsrep-notify.sh
+{% endif %}
wsrep_on = ON
max_connections=10000
diff --git a/ansible/roles/mariadb/templates/mariadb.json.j2 b/ansible/roles/mariadb/templates/mariadb.json.j2
index 1b77f5e88..e9003a0df 100644
--- a/ansible/roles/mariadb/templates/mariadb.json.j2
+++ b/ansible/roles/mariadb/templates/mariadb.json.j2
@@ -7,13 +7,13 @@
"dest": "/etc/{{ mysql_dir }}/my.cnf",
"owner": "mysql",
"perm": "0600"
- },
+ }{% if not enable_mariadb_clustercheck | bool %},
{
"source": "{{ container_config_directory }}/wsrep-notify.sh",
"dest": "/usr/local/bin/wsrep-notify.sh",
"owner": "mysql",
"perm": "0700"
- }
+ }{% endif %}
],
"permissions": [
{
--
GitLab