containerd: use package instead of action

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 1b88678cf3)

roles/container-engine/containerd/tasks/main.yml

@@ -92,18 +92,22 @@
   when: ansible_pkg_mgr == 'apt'
 
 - name: ensure containerd packages are installed
-  action: "{{ containerd_package_info.pkg_mgr }}"
+  package:
-  args:
+    name: "{{ containerd_package_info.pkgs }}"
-    pkg: "{{ item.name }}"
-    force: "{{ item.force | default(omit) }}"
     state: present
-    update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}"
+  module_defaults:
-    enablerepo: "{{ item.repo | default(omit) }}"
+    apt:
+      update_cache: true
+    dnf:
+      enablerepo: "{{ containerd_package_info.enablerepo | default(omit) }}"
+    yum:
+      enablerepo: "{{ containerd_package_info.enablerepo | default(omit) }}"
+    zypper:
+      update_cache: true
   register: containerd_task_result
   until: containerd_task_result is succeeded
   retries: 4
   delay: "{{ retry_stagger | d(3) }}"
-  with_items: "{{ containerd_package_info.pkgs }}"
   notify: restart containerd
   when:
     - not is_ostree

roles/container-engine/containerd/vars/debian.yml

@@ -1,9 +1,7 @@
 ---
 containerd_package_info:
-  pkg_mgr: apt
   pkgs:
-    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+    - "{{ containerd_versioned_pkg[containerd_version | string] }}"
-      force: false
 
 containerd_repo_key_info:
   pkg_key: apt_key

roles/container-engine/containerd/vars/fedora.yml

@@ -1,6 +1,5 @@
 ---
 containerd_package_info:
-  pkg_mgr: dnf
+  enablerepo: "docker-ce"
   pkgs:
-    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+    - "{{ containerd_versioned_pkg[containerd_version | string] }}"
-      repo: "docker-ce"

roles/container-engine/containerd/vars/redhat.yml

@@ -1,9 +1,8 @@
 ---
 containerd_package_info:
-  pkg_mgr: yum
+  enablerepo: "docker-ce"
   pkgs:
-    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+    - "{{ containerd_versioned_pkg[containerd_version | string] }}"
-      repo: "docker-ce"
 
 containerd_repo_key_info:
   pkg_key: ''

roles/container-engine/containerd/vars/suse.yml

@@ -3,10 +3,8 @@
 containerd_package: containerd
 
 containerd_package_info:
-  pkg_mgr: zypper
   pkgs:
-    - name: "{{ containerd_package }}"
+    - "{{ containerd_package }}"
-      state: latest
 
 containerd_repo_key_info:
   pkg_key: ''

roles/container-engine/containerd/vars/ubuntu.yml

@@ -1,9 +1,7 @@
 ---
 containerd_package_info:
-  pkg_mgr: apt
   pkgs:
-    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+    - "{{ containerd_versioned_pkg[containerd_version | string] }}"
-      force: false
 
 containerd_repo_key_info:
   pkg_key: apt_key