From e5511f0c9f52ed7d5d02c304b70384672ad88aa0 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 22 Dec 2021 11:41:47 -0500 Subject: [PATCH] common: Enable epel9 Signed-off-by: David Galloway --- roles/common/tasks/yum_systems.yml | 4 +--- roles/common/templates/epel-mirrorlist | 12 ++++++------ roles/common/templates/epel-testing-mirrorlist | 12 ++++++------ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/roles/common/tasks/yum_systems.yml b/roles/common/tasks/yum_systems.yml index 4949788..f424174 100644 --- a/roles/common/tasks/yum_systems.yml +++ b/roles/common/tasks/yum_systems.yml @@ -72,9 +72,7 @@ # create and manage epel.repo - import_tasks: epel.yml - when: - - (ansible_distribution == "CentOS" or ansible_distribution == 'RedHat') - - ansible_distribution_major_version|int < 9 + when: ansible_distribution == "CentOS" or ansible_distribution == 'RedHat' tags: - epel - repos diff --git a/roles/common/templates/epel-mirrorlist b/roles/common/templates/epel-mirrorlist index 2cea816..6f0a684 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 }}/{% 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 +http://download-ib01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://download-cc-rdu01.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirrors.cat.pdx.edu/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirror.pnl.gov/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://ftp.linux.ncsu.edu/pub/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirror.oss.ou.edu/epel/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch diff --git a/roles/common/templates/epel-testing-mirrorlist b/roles/common/templates/epel-testing-mirrorlist index be88fdf..50db95b 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 }}/{% 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 +http://download-ib01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://download-cc-rdu01.fedoraproject.org/pub/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirrors.cat.pdx.edu/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirror.pnl.gov/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://fedora-epel.mirror.lstn.net/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch +http://mirror.oss.ou.edu/epel/testing/{{ ansible_distribution_major_version }}/{% if ansible_distribution_major_version|int >= 9 %}Everything/{% endif %}$basearch -- 2.39.5