From: David Galloway <dgallowa@redhat.com>
Date: Mon, 16 May 2022 15:25:20 +0000 (-0400)
Subject: testnode: Fix BaseOS repo name
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=212397bd29ac6a60872bb0d329558335808dba9e;p=ceph-cm-ansible.git

testnode: Fix BaseOS repo name

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/testnode/templates/mirrorlists/8/CentOS-Base-mirrorlist b/roles/testnode/templates/mirrorlists/8/CentOS-Base-mirrorlist
deleted file mode 100644
index 5711d920..00000000
--- a/roles/testnode/templates/mirrorlists/8/CentOS-Base-mirrorlist
+++ /dev/null
@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-
-# local yum mirrorlist for CentOS-8 - Base repo
-https://download-cc-rdu01.fedoraproject.org/pub/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
-http://mirror.linux.duke.edu/pub/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
-http://packages.oit.ncsu.edu/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
-http://distro.ibiblio.org/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
diff --git a/roles/testnode/templates/mirrorlists/8/CentOS-BaseOS-mirrorlist b/roles/testnode/templates/mirrorlists/8/CentOS-BaseOS-mirrorlist
new file mode 100644
index 00000000..5711d920
--- /dev/null
+++ b/roles/testnode/templates/mirrorlists/8/CentOS-BaseOS-mirrorlist
@@ -0,0 +1,7 @@
+# {{ ansible_managed }}
+
+# local yum mirrorlist for CentOS-8 - Base repo
+https://download-cc-rdu01.fedoraproject.org/pub/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
+http://mirror.linux.duke.edu/pub/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
+http://packages.oit.ncsu.edu/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
+http://distro.ibiblio.org/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/BaseOS/x86_64/os/
diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index cd465f12..2268c516 100644
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -17,9 +17,9 @@ yum_repos:
     gpgcheck: 1
     enabled: 1
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-  CentOS-Base:
-    name: "CentOS-$releasever - Base"
-    mirrorlist: file:///etc/yum.repos.d/CentOS-Base-mirrorlist
+  CentOS-BaseOS:
+    name: "CentOS-$releasever - BaseOS"
+    mirrorlist: file:///etc/yum.repos.d/CentOS-BaseOS-mirrorlist
     gpgcheck: 1
     enabled: 1
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
@@ -39,7 +39,7 @@ yum_repos:
 # These are files in roles/testnodes/templates/mirrorlists/8/
 yum_mirrorlists:
   - CentOS-AppStream-mirrorlist
-  - CentOS-Base-mirrorlist
+  - CentOS-BaseOS-mirrorlist
   - CentOS-Extras-mirrorlist
   - CentOS-PowerTools-mirrorlist
 
diff --git a/roles/testnode/vars/centos_9.yml b/roles/testnode/vars/centos_9.yml
index 2da8b378..f32585fc 100644
--- a/roles/testnode/vars/centos_9.yml
+++ b/roles/testnode/vars/centos_9.yml
@@ -10,8 +10,8 @@ yum_repos:
     gpgcheck: 0
     enabled: 1
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-  CentOS-Base:
-    name: "CentOS-$releasever - Base"
+  CentOS-BaseOS:
+    name: "CentOS-$releasever - BaseOS"
     baseurl: https://composes.stream.centos.org/test/latest-CentOS-Stream/compose/BaseOS/x86_64/os/
     gpgcheck: 0
     enabled: 1