From 44c32049992dae0c1af5b8efed466cf9a01a7fa1 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Tue, 17 Sep 2024 16:44:38 -0700 Subject: [PATCH] drop support for EL7 --- manifests/params.pp | 34 +++++++++++++--------------------- metadata.json | 16 ---------------- 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index a4c9e4e..62a470a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -8,66 +8,58 @@ # the most specific declaration of proxy. $proxy = 'absent' - if $facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] == '2' { - # Amazon Linux 2 is equivalent of Enterprise Linux 7 so we use that version for epel - # https://aws.amazon.com/premiumsupport/knowledge-center/ec2-enable-epel/ - $os_maj_release = '7' - } else { - $os_maj_release = $facts['os']['release']['major'] - } - - if versioncmp($os_maj_release,'8') >= 0 { + if versioncmp($facts['os']['release']['major'],'8') >= 0 { $failovermethod = 'absent' } else { $failovermethod = 'priority' } - $epel_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-${os_maj_release}&arch=\$basearch" + $epel_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch" $epel_baseurl = 'absent' $epel_failovermethod = $failovermethod $epel_proxy = $proxy $epel_enabled = '1' $epel_gpgcheck = '1' $epel_repo_gpgcheck = '0' - $epel_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-${os_maj_release}&arch=\$basearch" - $epel_testing_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-epel${os_maj_release}&arch=\$basearch" + $epel_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch" + $epel_testing_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-epel${facts['os']['release']['major']}&arch=\$basearch" $epel_testing_baseurl = 'absent' $epel_testing_failovermethod = $failovermethod $epel_testing_proxy = $proxy $epel_testing_enabled = '0' $epel_testing_gpgcheck = '1' $epel_testing_repo_gpgcheck = '0' - $epel_testing_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-epel${os_maj_release}&arch=\$basearch" - $epel_source_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-source-${os_maj_release}&arch=\$basearch" + $epel_testing_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-epel${facts['os']['release']['major']}&arch=\$basearch" + $epel_source_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-source-${facts['os']['release']['major']}&arch=\$basearch" $epel_source_baseurl = 'absent' $epel_source_failovermethod = $failovermethod $epel_source_proxy = $proxy $epel_source_enabled = '0' $epel_source_gpgcheck = '1' $epel_source_repo_gpgcheck = '0' - $epel_source_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-source-${os_maj_release}&arch=\$basearch" - $epel_debuginfo_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-debug-${os_maj_release}&arch=\$basearch" + $epel_source_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-source-${facts['os']['release']['major']}&arch=\$basearch" + $epel_debuginfo_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=epel-debug-${facts['os']['release']['major']}&arch=\$basearch" $epel_debuginfo_baseurl = 'absent' $epel_debuginfo_failovermethod = $failovermethod $epel_debuginfo_proxy = $proxy $epel_debuginfo_enabled = '0' $epel_debuginfo_gpgcheck = '1' $epel_debuginfo_repo_gpgcheck = '0' - $epel_debuginfo_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-debug-${os_maj_release}&arch=\$basearch" - $epel_testing_source_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel${os_maj_release}&arch=\$basearch" + $epel_debuginfo_metalink = "https://mirrors.fedoraproject.org/metalink?repo=epel-debug-${facts['os']['release']['major']}&arch=\$basearch" + $epel_testing_source_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel${facts['os']['release']['major']}&arch=\$basearch" $epel_testing_source_baseurl = 'absent' $epel_testing_source_failovermethod = $failovermethod $epel_testing_source_proxy = $proxy $epel_testing_source_enabled = '0' $epel_testing_source_gpgcheck = '1' $epel_testing_source_repo_gpgcheck = '0' - $epel_testing_source_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel${os_maj_release}&arch=\$basearch" - $epel_testing_debuginfo_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel${os_maj_release}&arch=\$basearch" + $epel_testing_source_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel${facts['os']['release']['major']}&arch=\$basearch" + $epel_testing_debuginfo_mirrorlist = "https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel${facts['os']['release']['major']}&arch=\$basearch" $epel_testing_debuginfo_baseurl = 'absent' $epel_testing_debuginfo_failovermethod = $failovermethod $epel_testing_debuginfo_proxy = $proxy $epel_testing_debuginfo_enabled = '0' $epel_testing_debuginfo_gpgcheck = '1' $epel_testing_debuginfo_repo_gpgcheck = '0' - $epel_testing_debuginfo_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel${os_maj_release}&arch=\$basearch" + $epel_testing_debuginfo_metalink = "https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel${facts['os']['release']['major']}&arch=\$basearch" } diff --git a/metadata.json b/metadata.json index ab2f3aa..c28cc4b 100644 --- a/metadata.json +++ b/metadata.json @@ -11,25 +11,10 @@ { "operatingsystem": "RedHat", "operatingsystemrelease": [ - "7", "8", "9" ] }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7", - "8", - "9" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, { "operatingsystem": "AlmaLinux", "operatingsystemrelease": [ @@ -47,7 +32,6 @@ { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ - "7", "8", "9" ]