containerd,docker: use apt_key instead of action

we don't need rpm_key, so nothing to factor here
Ubuntu is not an ansible_os_family, the OS family for Ubuntu is Debian
Check for ansible_pkg_mgr == apt

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

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

@@ -1,7 +1,6 @@
 ---
 - name: ensure containerd repository public key is installed
-  action: "{{ containerd_repo_key_info.pkg_key }}"
-  args:
+  apt_key:
     id: "{{ item }}"
     url: "{{ containerd_repo_key_info.url }}"
     state: present
@@ -11,8 +10,7 @@
   delay: "{{ retry_stagger | d(3) }}"
   with_items: "{{ containerd_repo_key_info.repo_keys }}"
   environment: "{{ proxy_env }}"
-  when:
-    - ansible_os_family in ['Ubuntu', 'Debian']
+  when: ansible_pkg_mgr == 'apt'
 
 - name: ensure containerd repository is enabled
   action: "{{ containerd_repo_info.pkg_repo }}"

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

@@ -4,7 +4,6 @@ containerd_package_info:
     - "{{ containerd_versioned_pkg[containerd_version | string] }}"
 
 containerd_repo_key_info:
-  pkg_key: apt_key
   url: '{{ containerd_debian_repo_gpgkey }}'
   repo_keys:
     - '{{ containerd_debian_repo_repokey }}'

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

@@ -4,10 +4,6 @@ containerd_package_info:
   pkgs:
     - "{{ containerd_versioned_pkg[containerd_version | string] }}"
 
-containerd_repo_key_info:
-  pkg_key: ''
-  repo_keys: []
-
 containerd_repo_info:
   pkg_repo: ''
   repos: []

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

@@ -6,10 +6,6 @@ containerd_package_info:
   pkgs:
     - "{{ containerd_package }}"
 
-containerd_repo_key_info:
-  pkg_key: ''
-  repo_keys: []
-
 containerd_repo_info:
   pkg_repo: ''
   repos: []

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

@@ -4,7 +4,6 @@ containerd_package_info:
     - "{{ containerd_versioned_pkg[containerd_version | string] }}"
 
 containerd_repo_key_info:
-  pkg_key: apt_key
   url: '{{ containerd_ubuntu_repo_gpgkey }}'
   repo_keys:
     - '{{ containerd_ubuntu_repo_repokey }}'

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

@@ -54,8 +54,7 @@
 - import_tasks: pre-upgrade.yml
 
 - name: ensure docker-ce repository public key is installed
-  action: "{{ docker_repo_key_info.pkg_key }}"
-  args:
+  apt_key:
     id: "{{ item }}"
     url: "{{ docker_repo_key_info.url }}"
     state: present
@@ -65,7 +64,7 @@
   delay: "{{ retry_stagger | d(3) }}"
   with_items: "{{ docker_repo_key_info.repo_keys }}"
   environment: "{{ proxy_env }}"
-  when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree)
+  when: ansible_pkg_mgr == 'apt'
 
 - name: ensure docker-ce repository is enabled
   action: "{{ docker_repo_info.pkg_repo }}"

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

@@ -21,7 +21,6 @@ docker_package_info:
     - "{{ docker_versioned_pkg[docker_version | string] }}"
 
 docker_repo_key_info:
-  pkg_key: apt_key
   url: '{{ docker_debian_repo_gpgkey }}'
   repo_keys:
     - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88

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

@@ -23,10 +23,6 @@ docker_package_info:
     - "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
     - "{{ docker_versioned_pkg[docker_version | string] }}"
 
-docker_repo_key_info:
-  pkg_key: ''
-  repo_keys: []
-
 docker_repo_info:
   pkg_repo: ''
   repos: []

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

@@ -5,10 +5,6 @@ docker_package_info:
     - docker
     - containerd
 
-docker_repo_key_info:
-  pkg_key: ''
-  repo_keys: []
-
 docker_repo_info:
   pkg_repo: ''
   repos: []

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

@@ -21,7 +21,6 @@ docker_package_info:
     - "{{ docker_versioned_pkg[docker_version | string] }}"
 
 docker_repo_key_info:
-  pkg_key: apt_key
   url: '{{ docker_ubuntu_repo_gpgkey }}'
   repo_keys:
     - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88