Manage containerd.io package with docker CRI. (#6218)

* Manage containerd.io package with docker CRI.

* Refactor common containerd stuff to separate role

* Fix check mode and unnecessary shell.

roles/container-engine/docker/meta/main.yml

@@ -1,4 +1,5 @@
 ---
 dependencies:
+  - role: container-engine/containerd-common
   - role: container-engine/docker-storage
     when: docker_container_storage_setup and ansible_os_family == "RedHat"

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

@@ -196,6 +196,7 @@
     - docker_task_result is failed
     - ansible_distribution == 'Ubuntu'
   register: available_packages
+  check_mode: false
 
 - name: show available packages on ubuntu
   fail:
@@ -239,6 +240,7 @@
   command: "docker version -f '{{ '{{' }}.Client.Version{{ '}}' }}'"
   register: installed_docker_version
   changed_when: false
+  check_mode: false
 
 - name: check minimum docker version for docker_dns mode. You need at least docker version >= 1.12 for resolvconf_mode=docker_dns
   fail:

roles/container-engine/docker/tasks/systemd.yml

@@ -17,6 +17,7 @@
   register: systemd_version
   when: not is_ostree
   changed_when: false
+  check_mode: false
 
 - name: Write docker.service systemd file
   template:

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

@@ -24,6 +24,8 @@ docker_cli_versioned_pkg:
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+      force: yes
     - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
       force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"

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

@@ -21,5 +21,6 @@ docker_cli_versioned_pkg:
 docker_package_info:
   pkg_mgr: dnf
   pkgs:
+    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
     - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"

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

@@ -35,6 +35,8 @@ docker_pkgs_use_docker_ce:
     yum_conf: "{{ docker_yum_conf }}"
 
 docker_pkgs:
+  - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+    yum_conf: "{{ docker_yum_conf }}"
   - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
     yum_conf: "{{ docker_yum_conf }}"
   - name: "{{ docker_versioned_pkg[docker_version | string] }}"

roles/container-engine/docker/vars/ubuntu-amd64.yml

@@ -24,6 +24,8 @@ docker_cli_versioned_pkg:
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+      force: yes
     - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
       force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"

roles/container-engine/docker/vars/ubuntu-arm64.yml

@@ -20,6 +20,8 @@ docker_cli_versioned_pkg:
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
+      force: yes
     - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
       force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"