feat: deep merge yum repos to manage
- fixed merging of yum repos - changed puppet7 to use local copy of repo
This commit is contained in:
@@ -6,7 +6,8 @@ class profiles::puppet::agent (
|
||||
|
||||
# Ensure the puppet-agent package is installed and locked to a specific version
|
||||
package { 'puppet-agent':
|
||||
ensure => $puppet_version,
|
||||
ensure => $puppet_version,
|
||||
require => Class['profiles::yum::puppet7'],
|
||||
}
|
||||
|
||||
# if puppet-version is anything other than latest, set a versionlock
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
# - 'appstream'
|
||||
#
|
||||
class profiles::yum::global (
|
||||
Array[String] $managed_repos = lookup('profiles::yum::managed_repos'),
|
||||
Array[String] $managed_repos,
|
||||
Boolean $purge = true,
|
||||
){
|
||||
class { 'yum':
|
||||
|
||||
@@ -30,29 +30,19 @@
|
||||
# }
|
||||
class profiles::yum::puppet7 (
|
||||
Array[String] $managed_repos,
|
||||
String $baseurl = 'http://yum.puppet.com',
|
||||
String $baseurl = 'http://repos.main.unkin.net/puppet7',
|
||||
) {
|
||||
$releasever = $facts['os']['release']['major']
|
||||
$basearch = $facts['os']['architecture']
|
||||
|
||||
if 'puppet7' in $managed_repos {
|
||||
if ($releasever in [7,8,9]) {
|
||||
$source = "${baseurl}/puppet7-release-el-${releasever}.noarch.rpm"
|
||||
|
||||
yum::install { 'puppet-release-el':
|
||||
ensure => present,
|
||||
source => $source,
|
||||
}
|
||||
} else {
|
||||
err("Unsupported OS release ${releasever}")
|
||||
}
|
||||
|
||||
yumrepo { 'puppet7':
|
||||
name => 'puppet7',
|
||||
descr => 'puppet7 repository',
|
||||
target => '/etc/yum.repos.d/puppet7.repo',
|
||||
baseurl => "${baseurl}/puppet/el/${releasever}/${basearch}/",
|
||||
gpgkey => "${baseurl}/RPM-GPG-KEY-puppet",
|
||||
baseurl => "${baseurl}/el/${releasever}-daily/${basearch}/os/",
|
||||
gpgkey => 'https://yum.puppet.com/RPM-GPG-KEY-puppet-20250406',
|
||||
#gpgkey => "${baseurl}/el/${releasever}-daily/${basearch}/os/RPM-GPG-KEY-puppet",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user