From 1eb1e103c5ec94df74ff211393b58636853be170 Mon Sep 17 00:00:00 2001 From: Michael Povel Date: Thu, 24 Oct 2024 10:42:30 +0000 Subject: [PATCH 1/5] Chnages to allow jinja2 native true --- tasks/debian.yml | 8 ++++++-- tasks/setup_cluster.yml | 2 +- vars/main.yml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tasks/debian.yml b/tasks/debian.yml index c43f591..a15fe28 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -15,7 +15,7 @@ - name: debian | adding MariaDB Repo Keys apt_key: keyserver: "{{ mariadb_debian_repo_keyserver }}" - id: "{{ mariadb_debian_repo_key }}" + id: "{{ mariadb_debian_repo_key|string }}" state: "present" become: true when: galera_enable_mariadb_repo|bool and not mariadb_debian_repo_key_url is defined @@ -58,4 +58,8 @@ become: true when: mariadb_config_overrides is defined -- ansible.builtin.import_tasks: mariadb_packages_install.yml +- 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 diff --git a/tasks/setup_cluster.yml b/tasks/setup_cluster.yml index 3e4aa01..482e1a0 100644 --- a/tasks/setup_cluster.yml +++ b/tasks/setup_cluster.yml @@ -48,7 +48,7 @@ galera_extra_wsrep_provider_options: > {{ galera_extra_wsrep_provider_options | combine({ - 'ist.recv_addr': galera_ist_recv_addr + ":" + galera_ist_recv_addr_port, + 'ist.recv_addr': galera_ist_recv_addr + ":" + galera_ist_recv_addr_port|string, 'ist.recv_bind': galera_ist_recv_bind }) }} diff --git a/vars/main.yml b/vars/main.yml index 168738c..8eaf4c2 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -4,6 +4,6 @@ galera_cluster_nodes: "\ {% set _galera_cluster_nodes = [] %}\ {% for host in groups[ galera_cluster_nodes_group ] %}\ - {{ _galera_cluster_nodes.append( host ) }}\ + {{ _galera_cluster_nodes.append( host )|default('', True) }}\ {% endfor %}\ {{ _galera_cluster_nodes }}" From bef96263921cf6637eea892bfbc9f520ebcd1486 Mon Sep 17 00:00:00 2001 From: Michael Povel Date: Thu, 24 Oct 2024 10:56:46 +0000 Subject: [PATCH 2/5] Revert former change --- tasks/debian.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tasks/debian.yml b/tasks/debian.yml index a15fe28..21cc242 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -58,8 +58,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 \ No newline at end of file From d174dd27038e71f355a720d3b1e7d21418afe1ba Mon Sep 17 00:00:00 2001 From: Michael Povel Date: Fri, 8 Nov 2024 12:08:14 +0000 Subject: [PATCH 3/5] Added newline --- tasks/mariadb_packages_install.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/mariadb_packages_install.yml b/tasks/mariadb_packages_install.yml index fece3a5..f26c557 100644 --- a/tasks/mariadb_packages_install.yml +++ b/tasks/mariadb_packages_install.yml @@ -5,3 +5,4 @@ state: "{{ mariadb_upgrade | ternary( 'latest', 'present' ) }}" update_cache: true become: true + From adf049feef0f80abc5efaacf5a3e0ed3ab1e1286 Mon Sep 17 00:00:00 2001 From: Michael Povel Date: Tue, 12 Nov 2024 06:57:52 +0000 Subject: [PATCH 4/5] Removed newline --- tasks/mariadb_packages_install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/mariadb_packages_install.yml b/tasks/mariadb_packages_install.yml index f26c557..fece3a5 100644 --- a/tasks/mariadb_packages_install.yml +++ b/tasks/mariadb_packages_install.yml @@ -5,4 +5,3 @@ state: "{{ mariadb_upgrade | ternary( 'latest', 'present' ) }}" update_cache: true become: true - From 1808a8a23ab7dafa2212d521623bebff36ee64a5 Mon Sep 17 00:00:00 2001 From: Michael Povel Date: Tue, 12 Nov 2024 07:01:34 +0000 Subject: [PATCH 5/5] Added another Newline before EOF --- tasks/debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/debian.yml b/tasks/debian.yml index 21cc242..ecdb5c9 100644 --- a/tasks/debian.yml +++ b/tasks/debian.yml @@ -58,4 +58,4 @@ become: true when: mariadb_config_overrides is defined -- ansible.builtin.import_tasks: mariadb_packages_install.yml \ No newline at end of file +- ansible.builtin.import_tasks: mariadb_packages_install.yml