From 7814245b992c4a9a64f9cb90425e9890190ee7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavi=20Lle=C3=B3=20Tom=C3=A1s?= <xavi@verdnatura.es>
Date: Tue, 17 Dec 2024 14:28:55 +0100
Subject: [PATCH] Refs #8140: MariaDB Server Deploy - Role WIP

---
 roles/services/defaults/main.yaml |  3 +++
 roles/services/tasks/mariadb.yml  | 15 +++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/roles/services/defaults/main.yaml b/roles/services/defaults/main.yaml
index 646f9e9..d33e66b 100644
--- a/roles/services/defaults/main.yaml
+++ b/roles/services/defaults/main.yaml
@@ -27,3 +27,6 @@ required_files_and_mariabackup_files_and_root_scripts:
   - { src: "files/scripts/README.md", dest: "/root/scripts/README.md", mode: "u=rw,g=r,o=r" }
   - { src: "files/scripts/scheduler-log.sh", dest: "/root/scripts/scheduler-log.sh", mode: "u=rwx,g=rx,o=rx" }
   - { src: "files/scripts/sync-conf.sh", dest: "/root/scripts/sync-conf.sh", mode: "u=rwx,g=rx,o=rx" }
+downloads:
+  - { url: "https://r.mariadb.com/downloads/mariadb_repo_setup", dest: "/tmp/mariadb_repo_setup", mode: "u=rwx,g=rx,o=rx" }
+  - { url: "https://repo.percona.com/apt/percona-release_latest.generic_all.deb", dest: "/tmp/percona-release_latest.generic_all.deb", mode: "u=rw,g=r,o=r" }
diff --git a/roles/services/tasks/mariadb.yml b/roles/services/tasks/mariadb.yml
index 9472247..0e42464 100644
--- a/roles/services/tasks/mariadb.yml
+++ b/roles/services/tasks/mariadb.yml
@@ -7,23 +7,18 @@
     state: present
     install_recommends: no
 
-- name: Download MariaDB repository setup script
+- name: Download required setup files
   get_url:
-    url: "https://r.mariadb.com/downloads/mariadb_repo_setup"
-    dest: "/tmp/mariadb_repo_setup"
-    mode: "u=rwx,g=rx,o=rx"
+    url: "{{ item.url }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  loop: "{{ downloads }}"
 
 - name: Run MariaDB repository setup script
   command:
     cmd: "/bin/bash /tmp/mariadb_repo_setup --mariadb-server-version=10.11.10"
     creates: "/etc/apt/sources.list.d/mariadb.list"
 
-- name: Download Percona repository package
-  get_url:
-    url: "https://repo.percona.com/apt/percona-release_latest.generic_all.deb"
-    dest: "/tmp/percona-release_latest.generic_all.deb"
-    mode: "u=rw,g=r,o=r"
-
 - name: Install Percona repository package
   apt:
     deb: "/tmp/percona-release_latest.generic_all.deb"