Merge branch 'mrlesmithjr:master' into upstreaming

andanotheruser · Oct 24, 2024 · 6fb25ae · 6fb25ae
2 parents b15cde4 + a83a130
commit 6fb25ae
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 47 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/tasks/debian.yml b/tasks/debian.yml
@@ -57,8 +57,4 @@
   become: true
   when: mariadb_config_overrides is defined
 
-- name: debian | installing mariadb-galera packages
-  ansible.builtin.apt:
-    name: "{{ (galera_sst_method == 'mariabackup') | ternary( mariadb_packages | union( mariabackup_packages ), mariadb_packages ) }}"
-    state: "present"
-  become: true
+- ansible.builtin.import_tasks: mariadb_packages_install.yml
diff --git a/tasks/mariadb_packages_install.yml b/tasks/mariadb_packages_install.yml
@@ -0,0 +1,7 @@
+---
+- name: mariadb_packages_install | installing mariadb-galera packages
+  ansible.builtin.package:
+    name: "{{ (galera_sst_method == 'mariabackup') | ternary( mariadb_packages | union( mariabackup_packages ), mariadb_packages ) }}"
+    state: "{{ mariadb_upgrade | ternary( 'latest', 'present' ) }}"
+    update_cache: true
+  become: true
diff --git a/tasks/redhat.yml b/tasks/redhat.yml
@@ -56,12 +56,7 @@
   become: true
   when: mariadb_config_overrides is defined
 
-- name: redhat | installing mariadb mysql
-  ansible.builtin.yum:
-    name: "{{ (galera_sst_method == 'mariabackup') | ternary( mariadb_packages | union( mariabackup_packages ), mariadb_packages ) }}"
-    state: "present"
-    update_cache: true
-  become: true
+- ansible.builtin.import_tasks: mariadb_packages_install.yml
 
 - name: redhat | remove migrated-from-my.cnf-settings.conf that is causing MariaDB to not start
   ansible.builtin.file:

diff --git a/vars/main.yml b/vars/main.yml
@@ -1,5 +1,4 @@
 ---
 # vars file for ansible-mariadb-galera-cluster
 
-galera_cluster_nodes: "{% set _galera_cluster_nodes = [] %}{% for host in groups[ galera_cluster_nodes_group ] %}{{   _galera_cluster_nodes.append( host ) }}{% endfor
-  %}{{ _galera_cluster_nodes }}"
+galera_cluster_nodes: "{% set _galera_cluster_nodes = [] %}{% for host in groups[ galera_cluster_nodes_group ] %}{{   _galera_cluster_nodes.append( host ) }}{% endfor %}{{ _galera_cluster_nodes }}"