From d8e47cba660b9254df0b961640f99c07c10bafd5 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Tue, 16 Aug 2022 14:29:07 +0200
Subject: [PATCH] Update ansible code

---
 defaults/main.yml         |  2 +-
 meta/main.yml             | 18 ++++++++++--------
 tasks/add_repo_Debian.yml | 11 +++++------
 tasks/add_repo_RedHat.yml | 20 ++++++++++----------
 tasks/install.yml         |  6 +++---
 tasks/main.yml            |  6 +++---
 tasks/uninstall.yml       | 14 +++++++-------
 vars/Debian.yml           |  1 -
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 545a339..5f0f4ea 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1 +1 @@
-ansible_uninstall: false
\ No newline at end of file
+ansible_uninstall: false
diff --git a/meta/main.yml b/meta/main.yml
index 092fbd6..f57074c 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,11 +6,13 @@ galaxy_info:
   galaxy_tags: []
   license: GPL2
   platforms:
-  - name: CentOS
-    version:
-    - 7
-    - 8
-  - name: RedHat
-    version:
-    - 7
-    - 8
+    - name: CentOS
+      version:
+        - 7
+        - 8
+        - 9
+    - name: RedHat
+      version:
+        - 7
+        - 8
+        - 9
diff --git a/tasks/add_repo_Debian.yml b/tasks/add_repo_Debian.yml
index 2dd5e12..2309219 100644
--- a/tasks/add_repo_Debian.yml
+++ b/tasks/add_repo_Debian.yml
@@ -1,6 +1,6 @@
 ---
 - name: Registering Ubuntu Ansible repository
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: ppa:ansible/ansible
     state: present
     update_cache: yes
@@ -8,22 +8,21 @@
     - ansible_distribution == "Ubuntu"
 
 - name: Registering Debian Ansible repository
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: deb http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_distribution_name }} main
     filename: ansible.list
     state: present
     update_cache: yes
-    mode: 0644
+    mode: "0644"
 #    owner: root
-#    group: root
+#    ansible.builtin.group: root
   when:
     - ansible_distribution == "Debian"
 
 - name: Install public repository Ansible GPG keys
-  apt_key:
+  ansible.builtin.apt_key:
     keyserver: keyserver.ubuntu.com
     id: 93C4A3FD7BB9C367
     state: present
   when:
     - ansible_distribution == "Debian"
-
diff --git a/tasks/add_repo_RedHat.yml b/tasks/add_repo_RedHat.yml
index 9a0d37d..d839ac2 100644
--- a/tasks/add_repo_RedHat.yml
+++ b/tasks/add_repo_RedHat.yml
@@ -1,19 +1,19 @@
 ---
-#- name: Registering Ansible repository
-#  get_url:
-#    url: https://releases.ansible.com/ansible/rpm/ansible.repo
-#    dest: /etc/yum.repos.d/ansible.repo
-#    owner: root
-#    group: root
-#    mode: 0644
+# - name: Registering Ansible repository
+#   ansible.builtin.get_url:
+#     url: https://releases.ansible.com/ansible/rpm/ansible.repo
+#     dest: /etc/yum.repos.d/ansible.repo
+#     owner: root
+#     ansible.builtin.group: root
+#     mode: 0644
 
 - name: Registering Ansible repository
-  copy:
+  ansible.builtin.copy:
     src: yum-ansible.repo
     dest: /etc/yum.repos.d/ansible.repo
     owner: root
-    group: root
-    mode: 0644
+    ansible.builtin.group: root
+    mode: "0644"
   when:
     - "ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat'"
     - "ansible_distribution_major_version < '8'"
diff --git a/tasks/install.yml b/tasks/install.yml
index 555c83a..0d363ab 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,13 +1,13 @@
 ---
   - name: Define repo for {{ ansible_os_family }}
-    include_tasks: add_repo_{{ ansible_os_family }}.yml
+    ansible.builtin.include_tasks: add_repo_{{ ansible_os_family }}.yml
     tags:
       - config
 
   - name: Install packages
-    package:
+    ansible.builtin.package:
       name: '{{ ansible_packages }}'
       state: present
-      update_cache: yes
+      update_cache: true
     tags:
       - installation
diff --git a/tasks/main.yml b/tasks/main.yml
index 4dbbc58..4238262 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
 - block:
   - name: Include vars for {{ ansible_os_family }}
-    include_vars: "{{ ansible_os_family }}.yml"
+    ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
   - name: Install Ansible
-    include_tasks: "install.yml"
+    ansible.builtin.include_tasks: "install.yml"
     when:
       - not ansible_uninstall|bool
 
   - name: UnInstall Ansible
-    include_tasks: "uninstall.yml"
+    ansible.builtin.include_tasks: "uninstall.yml"
     when:
       - ansible_uninstall|bool
 
diff --git a/tasks/uninstall.yml b/tasks/uninstall.yml
index e2790ed..fa0c9ab 100644
--- a/tasks/uninstall.yml
+++ b/tasks/uninstall.yml
@@ -1,30 +1,30 @@
 ---
   - name: Remove Ansible's files
-    file:
+    ansible.builtin.file:
       path: "/etc/yum.repos.d/ansible.repo"
       state: absent
     when:
       - ansible_os_family == 'RedHat'
 
   - name: Registering Ubuntu Ansible repository
-    apt_repository:
+    ansible.builtin.apt_repository:
       repo: ppa:ansible/ansible
       state: absent
-      update_cache: yes
+      update_cache: true
     when:
       - ansible_distribution == "Ubuntu"
 
   - name: Registering Debian Ansible repository
-    apt_repository:
+    ansible.builtin.apt_repository:
       repo: deb http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_distribution_name }} main
       filename: ansible.list
       state: absent
-      update_cache: yes
+      update_cache: true
     when:
       - ansible_distribution == "Debian"
 
   - name: Remove Ansible's packages
-    package:
+    ansible.builtin.package:
       name: '{{ ansible_packages }}'
       state: absent
-      update_cache: yes
+      update_cache: true
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 0e29ea2..6f8eb9e 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,4 +1,3 @@
 ---
 ansible_packages:
   - ansible
-