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 3f6b11dd6b4d86f78d8e33209d0b826be5087ceb..6d1b9df744390aba034ac7540e5ce6570e7e2bf7 100644 (file)
--- 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 0b9c6964c948e250340545e53e326c5969ac9b53..2cea816b04b6a1bbf9b97cf57322df5585f62cb9 100644 (file)
--- 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 1c9725697d4efb1f48e660103c69b24bf45e8ccb..be88fdfa0e276219864bc9d0aa6683464ae431ad 100644 (file)
--- 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