From 30fa3fa63b935c90680925fcf4bbf230aff006e0 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 31 Jan 2025 10:58:14 +0100 Subject: [PATCH] Correct mariadb restart handlers This behaviour was changed 65325d96876afcec4707852f5de258bdfd2b7912 but does not work for mariadb and mariadb-clustercheck. A fix was included in master as part of 23413d4e0f74a8f94f8c5e1e5fceb61c7d7d8327, let's do the same in our fork. Change-Id: Idfb5b814e16056d439cf1e1318f86bbcea82d981 --- ansible/roles/mariadb/handlers/main.yml | 4 ++-- ansible/roles/mariadb/tasks/config.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml index dbb6855ea3..df07bce72f 100644 --- a/ansible/roles/mariadb/handlers/main.yml +++ b/ansible/roles/mariadb/handlers/main.yml @@ -60,7 +60,7 @@ - groups[mariadb_shard_group + '_port_alive_True'] is defined - inventory_hostname in groups[mariadb_shard_group + '_port_alive_True'] - kolla_action != "config" - listen: restart mariadb + listen: Restart mariadb container - name: Start MariaDB on new nodes group_by: @@ -70,7 +70,7 @@ - groups[mariadb_shard_group + '_port_alive_False'] is defined - inventory_hostname in groups[mariadb_shard_group + '_port_alive_False'] - kolla_action != "config" - listen: restart mariadb + listen: Restart mariadb container - name: Restart mariadb-clustercheck container vars: diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index b0691deef9..6929271466 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -44,7 +44,7 @@ become: true with_dict: "{{ mariadb_services | select_services_enabled_and_mapped_to_host }}" notify: - - "restart {{ item.key }}" + - "Restart {{ item.key }} container" - name: Copying over config.json files for mariabackup vars: @@ -72,4 +72,4 @@ become: true when: service | service_enabled_and_mapped_to_host notify: - - restart mariadb + - Restart mariadb container