From cfada06486cd91169ecef6fb76e61e245414d332 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Fri, 22 Jan 2021 14:52:43 +0100
Subject: [PATCH] Fix repo files for CentOS Stream

Some repo file names and ids do not match the files provided by
CentOS, which can cause duplicated repos [1].

[1] - https://8a51f3027f5f50a14ba7-fcfc85786424b7f5a3fcadff9da35f94.ssl.cf5.rackcdn.com/770771/4/check/packstack-centos8s-integration-scenario002/9dc0bd2/logs/etc/yum.repos.d/index.html

Change-Id: Ib89ad9f79cd5317b3178301a47462277004fa81a
---
 roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml      | 4 ++--
 .../etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2           | 2 +-
 ...entOS-Stream-Base.repo.j2 => CentOS-Stream-BaseOS.repo.j2} | 2 +-
 ...ream-HA.repo.j2 => CentOS-Stream-HighAvailability.repo.j2} | 4 ++--
 .../etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/{CentOS-Stream-Base.repo.j2 => CentOS-Stream-BaseOS.repo.j2} (95%)
 rename roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/{CentOS-Stream-HA.repo.j2 => CentOS-Stream-HighAvailability.repo.j2} (79%)

diff --git a/roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml b/roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml
index afec7bb57..b91f0a54a 100644
--- a/roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml
+++ b/roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml
@@ -8,8 +8,8 @@
     src: "centos8-stream/{{ zj_repo }}.j2"
   with_items:
     - etc/yum.repos.d/CentOS-Stream-AppStream.repo
-    - etc/yum.repos.d/CentOS-Stream-Base.repo
-    - etc/yum.repos.d/CentOS-Stream-HA.repo
+    - etc/yum.repos.d/CentOS-Stream-BaseOS.repo
+    - etc/yum.repos.d/CentOS-Stream-HighAvailability.repo
     - etc/yum.repos.d/CentOS-Stream-Extras.repo
     - etc/yum.repos.d/CentOS-Stream-PowerTools.repo
   loop_control:
diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2
index a09791768..e38331905 100644
--- a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2
+++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
-[AppStream]
+[appstream]
 name=CentOS-Stream - AppStream
 baseurl={{ package_mirror }}/$stream/AppStream/$basearch/os/
 gpgcheck=1
diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-BaseOS.repo.j2
similarity index 95%
rename from roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2
rename to roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-BaseOS.repo.j2
index bbb1a3a9c..692037ea6 100644
--- a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2
+++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-BaseOS.repo.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
-[BaseOS]
+[baseos]
 name=CentOS-Stream - Base
 baseurl={{ package_mirror }}/$stream/BaseOS/$basearch/os/
 gpgcheck=1
diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HighAvailability.repo.j2
similarity index 79%
rename from roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2
rename to roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HighAvailability.repo.j2
index 9b9dd92e1..5d654cb37 100644
--- a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2
+++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HighAvailability.repo.j2
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
-[HighAvailability]
-name=CentOS-Stream - HA
+[ha]
+name=CentOS-Stream - HighAvailability
 baseurl={{ package_mirror }}/$stream/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2
index dc7501ec4..c2ec7caa4 100644
--- a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2
+++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
-[PowerTools]
+[powertools]
 name=CentOS-Stream - PowerTools
 baseurl={{ package_mirror }}/$stream/PowerTools/$basearch/os/
 gpgcheck=1