From 5cfc37b300a8800aefde8869ae75d5506dbe575a Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 18 Dec 2020 12:11:17 +0530 Subject: [PATCH] Rename CentOS8 repo files to CentOS-Linux With CentOS8.3 release repo files are now renamed to CentOS-Linux*, update in zuul-jobs too to sync, also update repo names as per latest CentOS8 minor release. The change is needed now as dib images are updated to reflect new repo files post [1]. [1] https://review.opendev.org/c/openstack/diskimage-builder/+/765963 Change-Id: I7ed9bd582043717ae5bae303ea9b32db7f73008e --- roles/configure-mirrors/tasks/mirror/CentOS-8.yaml | 10 +++++----- ...ppStream.repo.j2 => CentOS-Linux-AppStream.repo.j2} | 4 ++-- ...CentOS-Base.repo.j2 => CentOS-Linux-BaseOS.repo.j2} | 4 ++-- ...ntOS-Extras.repo.j2 => CentOS-Linux-Extras.repo.j2} | 0 ...A.repo.j2 => CentOS-Linux-HighAvailability.repo.j2} | 4 ++-- ...erTools.repo.j2 => CentOS-Linux-PowerTools.repo.j2} | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename roles/configure-mirrors/templates/centos8/etc/yum.repos.d/{CentOS-AppStream.repo.j2 => CentOS-Linux-AppStream.repo.j2} (67%) rename roles/configure-mirrors/templates/centos8/etc/yum.repos.d/{CentOS-Base.repo.j2 => CentOS-Linux-BaseOS.repo.j2} (79%) rename roles/configure-mirrors/templates/centos8/etc/yum.repos.d/{CentOS-Extras.repo.j2 => CentOS-Linux-Extras.repo.j2} (100%) rename roles/configure-mirrors/templates/centos8/etc/yum.repos.d/{CentOS-HA.repo.j2 => CentOS-Linux-HighAvailability.repo.j2} (78%) rename roles/configure-mirrors/templates/centos8/etc/yum.repos.d/{CentOS-PowerTools.repo.j2 => CentOS-Linux-PowerTools.repo.j2} (94%) diff --git a/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml b/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml index a9f51e244..6b210b29e 100644 --- a/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml +++ b/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml @@ -7,11 +7,11 @@ owner: root src: "centos8/{{ zj_repo }}.j2" with_items: - - etc/yum.repos.d/CentOS-AppStream.repo - - etc/yum.repos.d/CentOS-Base.repo - - etc/yum.repos.d/CentOS-HA.repo - - etc/yum.repos.d/CentOS-Extras.repo - - etc/yum.repos.d/CentOS-PowerTools.repo + - etc/yum.repos.d/CentOS-Linux-AppStream.repo + - etc/yum.repos.d/CentOS-Linux-BaseOS.repo + - etc/yum.repos.d/CentOS-Linux-HighAvailability.repo + - etc/yum.repos.d/CentOS-Linux-Extras.repo + - etc/yum.repos.d/CentOS-Linux-PowerTools.repo - etc/yum.repos.d/epel.repo loop_control: loop_var: zj_repo diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2 similarity index 67% rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2 rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2 index 5941b4b27..1ab5df663 100644 --- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2 +++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} -[AppStream] +[appstream] name=CentOS-$releasever - AppStream baseurl={{ package_mirror }}/$releasever/AppStream/$basearch/os/ gpgcheck=1 enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial \ No newline at end of file +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2 similarity index 79% rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2 rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2 index 1437657b9..3d3ed2092 100644 --- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2 +++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2 @@ -1,6 +1,6 @@ # {{ ansible_managed }} -[BaseOS] -name=CentOS-$releasever - Base +[baseos] +name=CentOS-$releasever - BaseOS baseurl={{ package_mirror }}/$releasever/BaseOS/$basearch/os/ gpgcheck=1 enabled=1 diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Extras.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-Extras.repo.j2 similarity index 100% rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Extras.repo.j2 rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-Extras.repo.j2 diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2 similarity index 78% rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2 rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2 index 9726d5ae8..9e2db6b36 100644 --- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2 +++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2 @@ -1,6 +1,6 @@ # {{ ansible_managed }} -[HighAvailability] -name=CentOS-$releasever - HA +[ha] +name=CentOS-$releasever - HighAvailability baseurl={{ package_mirror }}/$releasever/HighAvailability/$basearch/os/ gpgcheck=1 enabled=1 diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2 similarity index 94% rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2 rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2 index b3a2c1b96..27e5ed8f7 100644 --- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2 +++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2 @@ -1,5 +1,5 @@ # {{ ansible_managed }} -[PowerTools] +[powertools] name=CentOS-$releasever - PowerTools baseurl={{ package_mirror }}/$releasever/PowerTools/$basearch/os/ gpgcheck=1