diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml index b075680..eaa2953 100644 --- a/hieradata/os/AlmaLinux/all_releases.yaml +++ b/hieradata/os/AlmaLinux/all_releases.yaml @@ -19,45 +19,53 @@ profiles::yum::global::repos: target: /etc/yum.repos.d/baseos.repo baseurl: https://edgecache.query.consul/almalinux/%{facts.os.release.full}/BaseOS/%{facts.os.architecture}/os gpgkey: http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-%{facts.os.release.major} + mirrorlist: absent extras: name: extras descr: extras repository target: /etc/yum.repos.d/extras.repo baseurl: https://edgecache.query.consul/almalinux/%{facts.os.release.full}/extras/%{facts.os.architecture}/os gpgkey: http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-%{facts.os.release.major} + mirrorlist: absent appstream: name: appstream descr: appstream repository target: /etc/yum.repos.d/appstream.repo baseurl: https://edgecache.query.consul/almalinux/%{facts.os.release.full}/AppStream/%{facts.os.architecture}/os gpgkey: http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-%{facts.os.release.major} + mirrorlist: absent powertools: name: powertools descr: powertools repository target: /etc/yum.repos.d/powertools.repo baseurl: https://edgecache.query.consul/almalinux/%{facts.os.release.full}/PowerTools/%{facts.os.architecture}/os gpgkey: http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-%{facts.os.release.major} + mirrorlist: absent highavailability: name: highavailability descr: highavailability repository target: /etc/yum.repos.d/highavailability.repo baseurl: https://edgecache.query.consul/almalinux/%{facts.os.release.full}/HighAvailability/%{facts.os.architecture}/os gpgkey: http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-%{facts.os.release.major} + mirrorlist: absent epel: name: epel descr: epel repository target: /etc/yum.repos.d/epel.repo baseurl: https://edgecache.query.consul/epel/%{facts.os.release.major}/Everything/%{facts.os.architecture} gpgkey: http://edgecache.query.consul/epel/RPM-GPG-KEY-EPEL-%{facts.os.release.major} + mirrorlist: absent puppet: name: puppet descr: puppet repository target: /etc/yum.repos.d/puppet.repo baseurl: https://yum.puppet.com/puppet7/el/%{facts.os.release.major}/%{facts.os.architecture} gpgkey: https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406 + mirrorlist: absent unkin: name: unkin descr: unkin repository target: /etc/yum.repos.d/unkin.repo baseurl: https://git.query.consul/api/packages/unkinben/rpm/el%{facts.os.release.major} gpgkey: https://git.query.consul/api/packages/unkinben/rpm/repository.key + mirrorlist: absent diff --git a/site/profiles/manifests/defaults.pp b/site/profiles/manifests/defaults.pp index c0b94a8..be4ec87 100644 --- a/site/profiles/manifests/defaults.pp +++ b/site/profiles/manifests/defaults.pp @@ -34,7 +34,6 @@ class profiles::defaults { ensure => 'present', enabled => 1, gpgcheck => 1, - mirrorlist => 'absent', require => Class['profiles::pki::vaultca'], notify => Exec['dnf_makecache'], } diff --git a/site/profiles/manifests/yum/global.pp b/site/profiles/manifests/yum/global.pp index 795e208..ed36d63 100644 --- a/site/profiles/manifests/yum/global.pp +++ b/site/profiles/manifests/yum/global.pp @@ -16,12 +16,12 @@ class profiles::yum::global ( purge => $purge, } - exec {'purge_almalinux_default_repos': - command => 'rm -f /etc/yum.repos.d/almalinux*.repo', - path => ['/bin', '/usr/bin'], - onlyif => 'find /etc/yum.repos.d/ -type f -name *almalinux* | grep .', - before => Resources['yumrepo'], - } + #exec {'purge_almalinux_default_repos': + # command => 'rm -f /etc/yum.repos.d/almalinux*.repo', + # path => ['/bin', '/usr/bin'], + # onlyif => 'find /etc/yum.repos.d/ -type f -name *almalinux* | grep .', + # before => Resources['yumrepo'], + #} # download all gpg keys if a repo defines it $repos.each |$name, $repo| { @@ -36,11 +36,12 @@ class profiles::yum::global ( before => Yumrepo[$name], } } + # create the repo + yumrepo { $name: + * => $repo, + } } - # create repos - create_resources('yumrepo', $repos) - # makecache if changes made to repos exec {'dnf_makecache': command => 'dnf makecache -q',