From 1382dfc3d21a82a55b0fb6b5f4ef201848a51daa Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Thu, 2 Sep 2021 16:19:50 +0200 Subject: [PATCH] Galera install imrovements - Do not force package ('galera-3' was hard coded) - Prevent some crashes when galera is installed with mariadb at the same time --- defaults/main.yml | 2 ++ tasks/galera/main.yml | 4 ++++ tasks/install/mariadb/default.yml | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5ce50ee..58d339e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -133,6 +133,8 @@ mariadb_galera_members: [] mariadb_galera_primary_node: 'change_me' # See: https://github.com/ansible/ansible/issues/17453 mariadb_wsrep_stt_method: 'rsync' +mariadb_galera_package_name: 'galera-4' + # ------------------------------------- # Debug # ------------------------------------- diff --git a/tasks/galera/main.yml b/tasks/galera/main.yml index f395283..e2f4c27 100644 --- a/tasks/galera/main.yml +++ b/tasks/galera/main.yml @@ -1,5 +1,9 @@ --- +- name: APT | Install Galera + apt: + pkg: "{{ mariadb_galera_package_name }}" + - name: TEMPLATE | Deploy Galera configuration template: src: etc/mysql/mariadb.conf.d/20-galera.cnf.j2 diff --git a/tasks/install/mariadb/default.yml b/tasks/install/mariadb/default.yml index 993ce1c..7e5566d 100644 --- a/tasks/install/mariadb/default.yml +++ b/tasks/install/mariadb/default.yml @@ -3,8 +3,3 @@ - name: APT | Install MariaDB server apt: pkg: mariadb-server - -- name: APT | Install Galera - apt: - pkg: galera-3 - when: mariadb_use_galera