From: David Galloway <dgallowa@redhat.com>
Date: Tue, 4 Feb 2020 23:00:20 +0000 (-0500)
Subject: common: Use global epel_repos var
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d8237f7f9d8e2841bb98f9444a25eeb52e3daf64;p=ceph-cm-ansible.git

common: Use global epel_repos var

I diverged a bit when CentOS/RHEL 8 came out and was using metalink when I meant to use mirrorlist.  We're seeing intermittent epel failures which should be resolved by using a mirrorlist instead of relying on dl.fedoraproject.org

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

diff --git a/roles/common/vars/centos_8.yml b/roles/common/vars/centos_8.yml
index c958acc..9af7db3 100644
--- a/roles/common/vars/centos_8.yml
+++ b/roles/common/vars/centos_8.yml
@@ -1,14 +1,4 @@
 ---
-epel_repos:
-  epel:
-    name: "Extra Packages for Enterprise Linux $releasever - $basearch"
-    metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-    baseurl: "{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch"
-    failovermethod: priority
-    # ternary requires ansible >= 1.9
-    enabled: "{{ enable_epel | ternary(1, 0) }}"
-    gpgcheck: 0
-
 nrpe_selinux_packages:
   - python3-libsemanage
   - python3-policycoreutils
diff --git a/roles/common/vars/redhat_8.yml b/roles/common/vars/redhat_8.yml
index 233814a..534fd20 100644
--- a/roles/common/vars/redhat_8.yml
+++ b/roles/common/vars/redhat_8.yml
@@ -3,16 +3,6 @@ rhsm_repos:
   - rhel-8-for-x86_64-baseos-rpms
   - rhel-8-for-x86_64-appstream-rpms
 
-epel_repos:
-  epel:
-    name: "Extra Packages for Enterprise Linux $releasever - $basearch"
-    metalink: https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-    baseurl: "{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch"
-    failovermethod: priority
-    # ternary requires ansible >= 1.9
-    enabled: "{{ enable_epel | ternary(1, 0) }}"
-    gpgcheck: 0
-
 nrpe_selinux_packages:
   - python3-libsemanage
   - python3-policycoreutils