From 1482ec60657b62bef53591b0b0104794ca03d9f3 Mon Sep 17 00:00:00 2001
From: Sven Velt <sven@velt.de>
Date: Fri, 11 Apr 2025 18:17:37 +0200
Subject: [PATCH] FQCM, ansible-lint, small fixes

---
 defaults/main.yml |  2 +-
 meta/main.yml     |  4 +++-
 tasks/main.yml    | 39 ++++++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index dd2049a..efbfa9f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 db_packages:
   - mariadb-server
-  - python3-mysqldb
+  - python3-pymysql
   - rsync
 
 db_servicename: mysql
diff --git a/meta/main.yml b/meta/main.yml
index a1e98df..b97c16c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -7,12 +7,14 @@ galaxy_info:
 
   license: GPL-2.0-or-later
 
-  min_ansible_version: 2.9
+  min_ansible_version: '2.9'
 
   platforms:
     - name: Ubuntu
       versions:
         - focal
+        - jammy
+        - noble
 
   galaxy_tags:
     - cluster
diff --git a/tasks/main.yml b/tasks/main.yml
index 472a110..ea4686c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,64 +1,69 @@
 ---
 - name: Install software
-  package:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   with_items: "{{ db_packages }}"
 
 
 - name: "Quick-Fix MariaDB/systemd problems"
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /usr/lib/systemd/system/mariadb.service
     regexp: "^SendSIGKILL=no"
     line: "SendSIGKILL=yes"
-    backup: yes
+    backup: true
   register: db_systemd_fix
   when: ansible_virtualization_type == "lxc"
 
 
-- name: Reload systemd daemon
-  command: /bin/systemctl daemon-reload
+- name: Reload systemd daemon # noqa: no-handler
+  ansible.builtin.systemd:
+    daemon_reload: true
   when: db_systemd_fix is changed
 
 
 - name: Get MariaDB settings
-  mysql_info:
+  community.mysql.mysql_info:
     filter: settings
+    login_unix_socket: /var/run/mysqld/mysqld.sock
   register: db_settings
 
 
 - name: "Config: Listen on all ip addresses"
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /etc/mysql/mariadb.conf.d/50-server.cnf
     regexp: "^ *#* *bind-address"
     line: "bind-address = 0.0.0.0"
-    backup: yes
+    backup: true
 
 
 - name: Template galera.cnf
-  template:
+  ansible.builtin.template:
     src: galera.cnf.j2
     dest: /etc/mysql/conf.d/galera.cnf
-    backup: yes
+    owner: root
+    group: root
+    mode: '0644'
+    backup: true
 
 
 - name: Init Galera cluster
+  when: db_settings.settings.wsrep_cluster_address == ""
   block:
     - name: 'Stop service "{{ db_servicename }}"'
-      service:
+      ansible.builtin.service:
         name: "{{ db_servicename }}"
         state: stopped
 
-    - name: Create galera cluster
-      command: /usr/bin/galera_new_cluster
+    - name: Create galera cluster # noqa: no-handler no-changed-when
+      ansible.builtin.command:
+        cmd: /usr/bin/galera_new_cluster
       when: inventory_hostname == groups.db.0
 
-  when: db_settings.settings.wsrep_cluster_address == ""
-
 
 - name: 'Enable service "{{ db_servicename }}"'
-  service:
+  ansible.builtin.service:
     name: "{{ db_servicename }}"
     state: started
-    enabled: yes
+    enabled: true