From de6c71a426e3dd42d9da35b87ea2f0035c8b519e Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Thu, 7 Jan 2021 17:54:03 -0500
Subject: [PATCH] docker: remove dockerproject repo reference

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
 .../container-engine/docker/defaults/main.yml |  6 -----
 roles/container-engine/docker/tasks/main.yml  | 26 -------------------
 roles/container-engine/docker/vars/debian.yml | 14 ----------
 roles/container-engine/docker/vars/ubuntu.yml | 14 ----------
 4 files changed, 60 deletions(-)

diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index 766041615..3ac22c029 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/roles/container-engine/docker/defaults/main.yml
@@ -12,12 +12,6 @@ docker_repo_key_info:
 docker_repo_info:
   repos:
 
-dockerproject_repo_key_info:
-  repo_keys:
-
-dockerproject_repo_info:
-  repos:
-
 docker_cgroup_driver: systemd
 
 docker_dns_servers_strict: true
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index 8272d2b45..5495bd84f 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -85,32 +85,6 @@
   with_items: "{{ docker_repo_info.repos }}"
   when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (docker_repo_info.repos|length > 0)
 
-- name: ensure docker-engine repository public key is installed
-  action: "{{ dockerproject_repo_key_info.pkg_key }}"
-  args:
-    id: "{{ item }}"
-    url: "{{ dockerproject_repo_key_info.url }}"
-    state: present
-  register: keyserver_task_result
-  until: keyserver_task_result is succeeded
-  retries: 4
-  delay: "{{ retry_stagger | d(3) }}"
-  with_items: "{{ dockerproject_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)
-    - use_docker_engine is defined and use_docker_engine
-
-- name: ensure docker-engine repository is enabled
-  action: "{{ dockerproject_repo_info.pkg_repo }}"
-  args:
-    repo: "{{ item }}"
-    state: present
-  with_items: "{{ dockerproject_repo_info.repos }}"
-  when:
-    - use_docker_engine is defined and use_docker_engine
-    - not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree) and (dockerproject_repo_info.repos|length > 0)
-
 - name: Configure docker repository on Fedora
   template:
     src: "fedora_docker.repo.j2"
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index 2a576dd7d..dc42ffafd 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/roles/container-engine/docker/vars/debian.yml
@@ -46,17 +46,3 @@ docker_repo_info:
       deb {{ docker_debian_repo_base_url }}
       {{ ansible_distribution_release|lower }}
       stable
-
-dockerproject_repo_key_info:
-  pkg_key: apt_key
-  url: '{{ docker_debian_repo_gpgkey }}'
-  repo_keys:
-    - 58118E89F3A912897C070ADBF76221572C52609D
-
-dockerproject_repo_info:
-  pkg_repo: apt_repository
-  repos:
-    - >
-      deb {{ docker_debian_repo_base_url }}
-      {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
-      main
diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
index dbe8ffc38..4050bf2a5 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/roles/container-engine/docker/vars/ubuntu.yml
@@ -41,17 +41,3 @@ docker_repo_info:
       deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
       {{ ansible_distribution_release|lower }}
       stable
-
-dockerproject_repo_key_info:
-  pkg_key: apt_key
-  url: '{{ docker_ubuntu_repo_gpgkey }}'
-  repo_keys:
-    - 58118E89F3A912897C070ADBF76221572C52609D
-
-dockerproject_repo_info:
-  pkg_repo: apt_repository
-  repos:
-    - >
-      deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
-      {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
-      main