From ed5a3fbd94c6bff2405240996e92feae157498e9 Mon Sep 17 00:00:00 2001
From: Faustin Lammler <faustin@fala.red>
Date: Thu, 24 Mar 2022 15:27:41 +0100
Subject: [PATCH] Ansible linting

---
 handlers/main.yml             |  2 +-
 tasks/backup.yml              |  8 ++++----
 tasks/configure.yml           |  8 ++++----
 tasks/replication_replica.yml | 10 +++++-----
 tasks/setup.yml               | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index e8710e8..5901b2a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: restart mariadb
-  service:
+  ansible.builtin.service:
     name: mariadb
     state: restarted
   when:
diff --git a/tasks/backup.yml b/tasks/backup.yml
index 1ef656c..cbb39b1 100644
--- a/tasks/backup.yml
+++ b/tasks/backup.yml
@@ -1,12 +1,12 @@
 ---
 - name: Install cron package
-  apt:
+  ansible.builtin.apt:
     package:
       - cron
     state: present
 
 - name: Deploy DB dump script
-  copy:
+  ansible.builtin.copy:
     src: mariadb_dump_db.sh
     dest: /usr/local/bin/mariadb_dump_db.sh
     owner: root
@@ -15,7 +15,7 @@
     validate: "bash -n %s"
 
 - name: Ensure backup dir exists
-  file:
+  ansible.builtin.file:
     path: "{{ mariadb_backup_db_dir }}"
     state: directory
     owner: root
@@ -23,7 +23,7 @@
     mode: 0755
 
 - name: Deploy crontab file
-  cron:
+  ansible.builtin.cron:
     name: "Dump MariaDB databases"
     minute: "{{ mariadb_backup_db_cron_min }}"
     hour: "{{ mariadb_backup_db_cron_hour }}"
diff --git a/tasks/configure.yml b/tasks/configure.yml
index a558c0f..d78f072 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,6 +1,6 @@
 ---
 - name: Copy global MariaDB configuration
-  template:
+  ansible.builtin.template:
     src: mariadb.cnf.j2
     dest: "{{ mariadb_config_file }}"
     owner: root
@@ -10,7 +10,7 @@
   notify: restart mariadb
 
 - name: Create datadir if it does not exist
-  file:
+  ansible.builtin.file:
     path: "{{ mariadb_datadir }}"
     state: directory
     owner: mysql
@@ -18,10 +18,10 @@
     mode: 0755
 
 - name: Ensure MariaDB is started and enabled on boot
-  service:
+  ansible.builtin.service:
     name: mariadb
     state: started
     enabled: "{{ mariadb_enabled_on_startup }}"
 
 - name: Immediately restart MariaDB (necessary for replication)
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers
diff --git a/tasks/replication_replica.yml b/tasks/replication_replica.yml
index 509fb88..b0a16e5 100644
--- a/tasks/replication_replica.yml
+++ b/tasks/replication_replica.yml
@@ -1,6 +1,6 @@
 ---
 - name: Check replica replication status
-  mysql_replication:
+  community.mysql.mysql_replication:
     mode: getreplica
     login_unix_socket: "{{ mariadb_unix_socket }}"
   register: replica
@@ -10,7 +10,7 @@
 # In ansible 2.10, we should be able to use mysql_replication module.
 # See https://github.com/ansible/ansible/pull/62648 (and below)
 - name: Configure replication on the replica
-  command: |
+  ansible.builtin.command: |
     /usr/bin/mariadb -e "CHANGE MASTER TO master_host='{{ mariadb_replication_master_ip }}',
     master_user='{{ item.name }}', master_password='{{ item.password }}', master_use_gtid=slave_pos"
   loop: "{{ mariadb_replication_user }}"
@@ -33,21 +33,21 @@
 #   no_log: true
 
 - name: Reset replica replication
-  mysql_replication:
+  community.mysql.mysql_replication:
     mode: resetreplica
     login_unix_socket: "{{ mariadb_unix_socket }}"
   when:
     - not replica.Is_Replica
 
 - name: Check replica replication status (second time)
-  mysql_replication:
+  community.mysql.mysql_replication:
     mode: getreplica
     login_unix_socket: "{{ mariadb_unix_socket }}"
   register: replica2
   no_log: true
 
 - name: Start replica replication
-  mysql_replication:
+  community.mysql.mysql_replication:
     mode: startreplica
     login_unix_socket: "{{ mariadb_unix_socket }}"
   when:
diff --git a/tasks/setup.yml b/tasks/setup.yml
index c48aa3b..05d8da1 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install mariadb repo necessary packages
-  apt:
+  ansible.builtin.apt:
     package:
       - software-properties-common
       - dirmngr
@@ -9,30 +9,30 @@
   when: mariadb_use_official_repo
 
 - name: Install mariadb repository key
-  apt_key:
+  ansible.builtin.apt_key:
     keyserver: keyserver.ubuntu.com
     id: "0xF1656F24C74CD1D8"
   when: mariadb_use_official_repo
 
 - name: Setup mariadb repository sourcelist entry
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: deb {{ mariadb_use_official_repo_url }}/{{ mariadb_use_official_repo_version }}/{{ ansible_distribution|lower() }} {{ ansible_distribution_release }} main
     filename: mariadb
     state: present
   when: mariadb_use_official_repo
 
 - name: Install mariadb
-  apt:
+  ansible.builtin.apt:
     package:
       - mariadb-server
     state: present
     update_cache: true
 
 - name: Determine required MariaDB Python libraries
-  set_fact:
+  ansible.builtin.set_fact:
     deb_mariadb_python_package: "{% if 'python3' in discovered_interpreter_python|default('') %}python3-pymysql{% else %}python-pymysql{% endif %}"
 
 - name: Install python mariadb driver
-  apt:
+  ansible.builtin.apt:
     name: "{{ deb_mariadb_python_package }}"
     state: present