From: David Galloway <dgallowa@redhat.com>
Date: Tue, 20 Jul 2021 16:20:57 +0000 (-0400)
Subject: testnode: Install PowerTools repo on CentOS non-stream too
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b7a112125843e04e690e80b6b53998059c942084;p=ceph-cm-ansible.git

testnode: Install PowerTools repo on CentOS non-stream too

Fixes: https://tracker.ceph.com/issues/51638#note-5

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

diff --git a/roles/testnode/templates/mirrorlists/8/CentOS-PowerTools-mirrorlist b/roles/testnode/templates/mirrorlists/8/CentOS-PowerTools-mirrorlist
new file mode 100644
index 0000000..89d3e64
--- /dev/null
+++ b/roles/testnode/templates/mirrorlists/8/CentOS-PowerTools-mirrorlist
@@ -0,0 +1,7 @@
+# {{ ansible_managed }}
+
+# local yum mirrorlist for CentOS-8 - PowerTools repo
+https://download-cc-rdu01.fedoraproject.org/pub/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/PowerTools/x86_64/os/
+http://distro.ibiblio.org/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/PowerTools/x86_64/os/
+http://packages.oit.ncsu.edu/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/PowerTools/x86_64/os/
+http://mirror.nodespace.net/centos/{{ ansible_distribution_major_version }}{{ dash_stream }}/PowerTools/x86_64/os/
diff --git a/roles/testnode/vars/centos_8.yml b/roles/testnode/vars/centos_8.yml
index 9f5c30d..cc46f7f 100644
--- a/roles/testnode/vars/centos_8.yml
+++ b/roles/testnode/vars/centos_8.yml
@@ -28,12 +28,19 @@ yum_repos:
     gpgcheck: 1
     enabled: 1
     gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+  CentOS-PowerTools:
+    name: "CentOS-$releasever - PowerTools"
+    mirrorlist: file:///etc/yum.repos.d/CentOS-PowerTools-mirrorlist
+    gpgcheck: 1
+    enabled: 1
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
 # These are files in roles/testnodes/templates/mirrorlists/8/
 yum_mirrorlists:
   - CentOS-AppStream-mirrorlist
   - CentOS-Base-mirrorlist
   - CentOS-Extras-mirrorlist
+  - CentOS-PowerTools-mirrorlist
 
 packages_to_upgrade:
   - libgcrypt # explicitly tied to qemu build
diff --git a/roles/testnode/vars/centos_8_stream.yml b/roles/testnode/vars/centos_8_stream.yml
deleted file mode 100644
index 840ac85..0000000
--- a/roles/testnode/vars/centos_8_stream.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# vars specific to centos 8 stream
-# Should be in addition to or in replace of vars in centos_8.yml
-
-additional_yum_repos:
-  CentOS-PowerTools:
-    name: "CentOS-$releasever - PowerTools"
-    mirrorlist: http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra
-    gpgcheck: 1
-    enabled: 1
-    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial