Merge "Do not enable mariadb-clustercheck when not needed" into stable/victoria

Zuul · openstack-gerrit · commit 70962ebf58a5 · 2021-10-29T11:48:44.000Z
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
@@ -117,4 +117,4 @@ mariadb_backup_type: "full"
 ####################
 # Clustercheck
 ####################
-enable_mariadb_clustercheck: "yes"
+enable_mariadb_clustercheck: "{{ enable_haproxy }}"
diff --git a/releasenotes/notes/bug-1944114-fa2a266c014c64a9.yaml b/releasenotes/notes/bug-1944114-fa2a266c014c64a9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes ``mariadb-clustercheck`` not to run when there is no HAProxy.
+    `LP#1944114 <https://launchpad.net/bugs/1944114>`__

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +fixes:
 +  - |
 +    Fixes ``mariadb-clustercheck`` not to run when there is no HAProxy.
 +    `LP#1944114 <https://launchpad.net/bugs/1944114>`__