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

---
 defaults/main.yml |  2 +-
 handlers/main.yml |  5 +++--
 meta/main.yml     | 18 ++++++++++--------
 tasks/main.yml    | 40 ++++++++++++++++++++--------------------
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0e1536a..7eb33bc 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-containerd_debug: false
\ No newline at end of file
+containerd_debug: false
diff --git a/handlers/main.yml b/handlers/main.yml
index f9a3cad..fb35378 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,5 @@
 ---
 - name: Restart containerd
-  service: name=containerd state=restarted
-
+  ansible.builtin.service:
+    name: containerd
+    state: restarted
diff --git a/meta/main.yml b/meta/main.yml
index 7639b0b..c1cfcf5 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/main.yml b/tasks/main.yml
index b520253..ddd09b3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,23 +1,23 @@
 ---
 - name: Include vars for {{ ansible_os_family }}
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Add Official docker's repo
-  get_url:
+  ansible.builtin.get_url:
     url: https://download.docker.com/linux/centos/docker-ce.repo
     dest: /etc/yum.repos.d/docker-ce.repo
     mode: 0644
   when:
     - ansible_os_family == "RedHat"
 
-#- name: Remove all other's containerd version packages
-#  package:
-#    name: "{{ containerd_remove_packages_name }}"
-#    state: absent
-#    update_cache: yes
+# - name: Remove all other's containerd version packages
+#   ansible.builtin.package:
+#     name: "{{ containerd_remove_packages_name }}"
+#     state: absent
+#     update_cache: true
 
 - name: Create thin volumes for containerd
-  lvol:
+  community.general.lvol:
     vg: "{{ item.vg }}"
     lv: "{{ item.name }}"
     thinpool: kubernetes
@@ -26,14 +26,14 @@
     - { name: var_lib_containerd, vg: vg_sys, size: 10g, mount_point: /var/lib/containerd, mount_opts: "discard"}
 
 - name: create file system on containerd lv
-  filesystem:
+  community.general.filesystem:
     fstype: ext4
     dev: "/dev/{{ item.vg }}/{{ item.name }}"
   with_items:
     - { name: var_lib_containerd, vg: vg_sys, size: 10g, mount_point: /var/lib/containerd, mount_opts: "discard"}
 
 - name: mount logical volumes
-  mount:
+  ansible.posix.mount:
     name: "{{ item.mount_point }}"
     src: "/dev/{{ item.vg }}/{{ item.name }}"
     fstype: ext4
@@ -43,20 +43,20 @@
     - { name: var_lib_containerd, vg: vg_sys, size: 10g, mount_point: /var/lib/containerd, mount_opts: "discard"}
 
 - name: Install containerd
-  package:
+  ansible.builtin.package:
     name: "{{ containerd_package_name }}"
     state: present
-    update_cache: yes
+    update_cache: true
   notify: Restart containerd
 
 - name: Enable containerd on boot
-  service:
+  ansible.builtin.service:
     name: containerd
     state: started
-    enabled: yes
+    enabled: true
 
 - name: Configuring kernel module to be load on boot
-  template:
+  ansible.builtin.template:
     src: "etc/modules-load.d/{{ item }}.conf.j2"
     dest: "/etc/modules-load.d/{{ item }}.conf"
     group: root
@@ -67,7 +67,7 @@
     - "overlay"
 
 - name: Load kernel module
-  modprobe:
+  community.general.modprobe:
     name: "{{ item }}"
     state: present
   with_items:
@@ -75,7 +75,7 @@
     - overlay
 
 - name: Configure sysctl
-  sysctl:
+  ansible.posix.sysctl:
     name: "{{ item }}"
     value: "1"
     sysctl_file: /etc/sysctl.d/99-kubernetes-cri.conf
@@ -86,7 +86,7 @@
     - "net.bridge.bridge-nf-call-ip6tables"
 
 - name: Ensuring /etc/containerd folder exists
-  file:
+  ansible.builtin.file:
     path: "/etc/containerd"
     state: "directory"
     group: root
@@ -94,7 +94,7 @@
     mode: 0755
 
 - name: Configuring containerd
-  template:
+  ansible.builtin.template:
     src: "etc/containerd/config.toml.j2"
     dest: "/etc/containerd/config.toml"
     group: root
@@ -103,4 +103,4 @@
   notify: Restart containerd
 
 - name: Flush handlers
-  meta: flush_handlers
+  ansible.builtin.meta: flush_handlers