From: David Galloway <dgallowa@redhat.com>
Date: Fri, 13 Dec 2019 16:52:38 +0000 (-0500)
Subject: common: Add missing 'Everything' subdir to EPEL8 URLs
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F502%2Fhead;p=ceph-cm-ansible.git

common: Add missing 'Everything' subdir to EPEL8 URLs

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

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 3f6b11dd..6d1b9df7 100644
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -17,7 +17,7 @@ epel_mirror_baseurl: "http://dl.fedoraproject.org/pub/epel"
 epel_repos:
   epel:
     name: "Extra Packages for Enterprise Linux"
-    baseurl: "{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/$basearch"
+    baseurl: "{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch"
     mirrorlist: file:///etc/yum.repos.d/epel-mirrorlist
     failovermethod: priority
     # ternary requires ansible >= 1.9
@@ -25,7 +25,7 @@ epel_repos:
     gpgcheck: 0
   epel-testing:
     name: "Extra Packages for Enterprise Linux - Testing"
-    baseurl: "{{ epel_mirror_baseurl }}/testing/{{ ansible_distribution_major_version }}/$basearch"
+    baseurl: "{{ epel_mirror_baseurl }}/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch"
     mirrorlist: file:///etc/yum.repos.d/epel-testing-mirrorlist
     failovermethod: priority
     enabled: 0
diff --git a/roles/common/templates/epel-mirrorlist b/roles/common/templates/epel-mirrorlist
index 0b9c6964..2cea816b 100644
--- a/roles/common/templates/epel-mirrorlist
+++ b/roles/common/templates/epel-mirrorlist
@@ -1,9 +1,9 @@
 # {{ ansible_managed }}
 
 # local yum mirrorlist for epel-{{ ansible_distribution_major_version }}
-http://download-ib01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/$basearch
-http://download-cc-rdu01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/$basearch
-http://mirrors.cat.pdx.edu/epel/{{ ansible_distribution_major_version }}/$basearch
-http://mirror.pnl.gov/epel/{{ ansible_distribution_major_version }}/$basearch
-http://ftp.linux.ncsu.edu/pub/epel/{{ ansible_distribution_major_version }}/$basearch
-http://mirror.oss.ou.edu/epel/{{ ansible_distribution_major_version }}/$basearch
+http://download-ib01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://download-cc-rdu01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirrors.cat.pdx.edu/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirror.pnl.gov/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://ftp.linux.ncsu.edu/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirror.oss.ou.edu/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
diff --git a/roles/common/templates/epel-testing-mirrorlist b/roles/common/templates/epel-testing-mirrorlist
index 1c972569..be88fdfa 100644
--- a/roles/common/templates/epel-testing-mirrorlist
+++ b/roles/common/templates/epel-testing-mirrorlist
@@ -1,9 +1,9 @@
 # {{ ansible_managed }}
 
 # local yum mirrorlist for epel-testing-{{ ansible_distribution_major_version }}
-http://download-ib01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/$basearch
-http://download-cc-rdu01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/$basearch
-http://mirrors.cat.pdx.edu/epel/testing/{{ ansible_distribution_major_version }}/$basearch
-http://mirror.pnl.gov/epel/testing/{{ ansible_distribution_major_version }}/$basearch
-http://fedora-epel.mirror.lstn.net/testing/{{ ansible_distribution_major_version }}/$basearch
-http://mirror.oss.ou.edu/epel/testing/{{ ansible_distribution_major_version }}/$basearch
+http://download-ib01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://download-cc-rdu01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirrors.cat.pdx.edu/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirror.pnl.gov/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://fedora-epel.mirror.lstn.net/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch
+http://mirror.oss.ou.edu/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version == '8' %}Everything/{% endif %}$basearch