From d31aa166f482e32c5b6517ba0570cba5f556dac4 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Fri, 18 Sep 2020 07:52:05 +0100 Subject: [PATCH] Update ensure-docker for new releases Docker just released official packages for centos-8 so we need to remove the temporary workaround that installs the previous release version. Change-Id: I787ce82b895069f4846fcdb35f55f0c9ad53652c --- roles/ensure-docker/tasks/docker-upstream.yaml | 12 ------------ roles/ensure-docker/vars/redhat.yaml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/roles/ensure-docker/tasks/docker-upstream.yaml b/roles/ensure-docker/tasks/docker-upstream.yaml index f7420521e..c2b932ba2 100644 --- a/roles/ensure-docker/tasks/docker-upstream.yaml +++ b/roles/ensure-docker/tasks/docker-upstream.yaml @@ -18,18 +18,6 @@ repositories_keys: "{{ _docker_keys }}" repositories_list: "{{ _docker_repos }}" - # Workaround for docker-ce installation failure due conflict with containerd.io - # https://bugzilla.redhat.com/show_bug.cgi?id=1756473#c1 - - name: Patch docker-ce.repo for newer RedHat distros - when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8' - ini_file: - path: /etc/yum.repos.d/docker-ce.repo - section: docker-ce-stable - option: module_hotfixes - value: "True" - no_extra_spaces: true - create: false - - name: Install pre-reqs package: name: "{{ _docker_upstream_distro_required_packages }}" diff --git a/roles/ensure-docker/vars/redhat.yaml b/roles/ensure-docker/vars/redhat.yaml index e8b54533f..3ddf14d83 100644 --- a/roles/ensure-docker/vars/redhat.yaml +++ b/roles/ensure-docker/vars/redhat.yaml @@ -38,7 +38,7 @@ _docker_repos: - name: docker-ce-stable file: docker-ce description: Docker CE Stable - $basearch - baseurl: "{{ docker_mirror_base_url }}/7/$basearch/stable" + baseurl: "{{ docker_mirror_base_url }}/$releasever/$basearch/stable" gpgcheck: yes _docker_distro_packages: