From 2798adc837bf985ba9addc3e578086a1072cc722 Mon Sep 17 00:00:00 2001
From: Sergey <s.bondarev@southbridge.ru>
Date: Tue, 28 Jan 2020 13:31:40 +0300
Subject: [PATCH] Remove stale legacy yum docker repo
/etc/yum.repos.d/docker.repo (#5569)
* Remove stale legacy yum docker repo /etc/yum.repos.d/docker.repo
* move task 'Remove legacy docker repo file' to pre-upgrade.yml
---
roles/container-engine/docker/tasks/pre-upgrade.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/roles/container-engine/docker/tasks/pre-upgrade.yml b/roles/container-engine/docker/tasks/pre-upgrade.yml
index 289211ed0..f00229101 100644
--- a/roles/container-engine/docker/tasks/pre-upgrade.yml
+++ b/roles/container-engine/docker/tasks/pre-upgrade.yml
@@ -1,4 +1,12 @@
---
+- name: Remove legacy docker repo file
+ file:
+ path: "{{ yum_repo_dir }}/docker.repo"
+ state: absent
+ when:
+ - ansible_distribution in ["CentOS","RedHat","OracleLinux"]
+ - not is_atomic
+
- name: Ensure old versions of Docker are not installed. | Debian
apt:
name: '{{ docker_remove_packages_apt }}'
--
GitLab