From a8e2110b2db5ff18aac99d17c39b298503113ce8 Mon Sep 17 00:00:00 2001 From: *=0=1=4=* <21157384+f35f0ef9d0e827dae86552d3899f78fc@users.noreply.github.com> Date: Fri, 21 Aug 2020 02:09:55 -0500 Subject: [PATCH] #6552 Update extras_rh_repo_base_url (#6556) --- roles/container-engine/containerd/defaults/main.yml | 4 ++-- roles/container-engine/docker/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml index 1e3e92751..fac50d446 100644 --- a/roles/container-engine/containerd/defaults/main.yml +++ b/roles/container-engine/containerd/defaults/main.yml @@ -31,8 +31,8 @@ containerd_repo_key_info: containerd_repo_info: repos: -extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/extras/$basearch/" -extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7" +extras_rh_repo_base_url: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/" +extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-{{ ansible_distribution_major_version }}" # Ubuntu docker-ce repo containerd_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu" diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index 69048f9c9..ced8777af 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -43,8 +43,8 @@ docker_debian_repo_base_url: "https://download.docker.com/linux/debian" docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg' docker_bin_dir: "/usr/bin" # CentOS/RedHat Extras repo -extras_rh_repo_base_url: "http://mirror.centos.org/centos/$releasever/extras/$basearch/" -extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-7" +extras_rh_repo_base_url: "http://mirror.centos.org/centos/{{ ansible_distribution_major_version }}/extras/$basearch/" +extras_rh_repo_gpgkey: "http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-{{ ansible_distribution_major_version }}" # flag to enable/disable docker cleanup docker_orphan_clean_up: false