2 files changed, 9 insertions, 71 deletions
diff --git a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_focal.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_focal.yaml
deleted file mode 100644
index 3e2686d565..0000000000
--- a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_focal.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-# file: roles/kernel/tasks/ubuntu_focal.yaml
-
-- name: Get Available Kernel Versions
-  command: "apt-cache showpkg linux-headers-*"
-  changed_when: false
-  register: apt_kernel_list
-  tags:
-    - kernel-inst
-
-- name: Get installed packages with APT
-  command: "dpkg -l"
-  changed_when: false
-  register: apt_packages_list
-  tags:
-    - kernel-inst
-
-- name: Set target APT kernel version
-  set_fact:
-    _kernel: "{{ apt_kernel_list | deb_kernel(
-                 kernel_version, ansible_kernel) }}"
-  tags:
-    - kernel-inst
-
-- name: Disable APT auto upgrade
-  lineinfile:
-    path: "/etc/apt/apt.conf.d/20auto-upgrades"
-    state: "present"
-    regexp: "APT::Periodic::Unattended-Upgrade \"[0-9]\";"
-    line: "APT::Periodic::Unattended-Upgrade \"0\";"
-    create: true
-    mode: 0644
-  tags:
-    - kernel-inst
-
-- name: Ensure Packages Versions
-  apt:
-    name: "{{ apt_kernel_list | deb_kernel_pkg(
-              kernel_version, ansible_kernel, ansible_distribution,
-              ansible_architecture, item) }}"
-  loop: "{{ kernel_packages }}"
-  tags:
-    - kernel-inst
-
-- name: Ensure Any Other Kernel Packages Are Removed
-  apt:
-    name: "{{ apt_packages_list | deb_installed_kernel(
-              apt_kernel_list, kernel_version, ansible_kernel) }}"
-    state: absent
-    purge: true
-  notify:
-    - "Reboot Server"
-  tags:
-    - kernel-inst
-
-- name: Ensure Any Microcode Is Absent
-  apt:
-    name: "{{ absent_packages }}"
-    state: absent
-    purge: true
-  tags:
-    - kernel-inst
diff --git a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
index 15ce221e66..af987d4e5a 100644
--- a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
+++ b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml
@@ -2,28 +2,28 @@
 # file: roles/kernel/tasks/ubuntu_jammy.yaml
 
 - name: Get Available Kernel Versions
-  command: "apt-cache showpkg linux-headers-*"
+  ansible.builtin.command: "apt-cache showpkg linux-headers-*"
   changed_when: false
   register: apt_kernel_list
   tags:
     - kernel-inst
 
 - name: Get installed packages with APT
-  command: "dpkg -l"
+  ansible.builtin.command: "dpkg -l"
   changed_when: false
   register: apt_packages_list
   tags:
     - kernel-inst
 
 - name: Set target APT kernel version
-  set_fact:
+  ansible.builtin.set_fact:
     _kernel: "{{ apt_kernel_list | deb_kernel(
                  kernel_version, ansible_kernel) }}"
   tags:
     - kernel-inst
 
 - name: Disable APT auto upgrade
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: "/etc/apt/apt.conf.d/20auto-upgrades"
     state: "present"
     regexp: "APT::Periodic::Unattended-Upgrade \"[0-9]\";"
@@ -34,7 +34,7 @@
     - kernel-inst
 
 - name: Ensure Packages Versions
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_kernel_list | deb_kernel_pkg(
               kernel_version, ansible_kernel, ansible_distribution,
               ansible_architecture, item) }}"
@@ -43,10 +43,10 @@
     - kernel-inst
 
 - name: Ensure Any Other Kernel Packages Are Removed
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_packages_list | deb_installed_kernel(
               apt_kernel_list, kernel_version, ansible_kernel) }}"
-    state: absent
+    state: "absent"
     purge: true
   notify:
     - "Reboot Server"
@@ -54,9 +54,9 @@
     - kernel-inst
 
 - name: Ensure Any Microcode Is Absent
-  apt:
+  ansible.builtin.apt:
     name: "{{ absent_packages }}"
-    state: absent
+    state: "absent"
     purge: true
   tags:
     - kernel-inst