tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yum: Use local copy of Puppetlab's key. Also fix for stupid \releasever in RHEL7 beta.

Browse source
This commit is contained in:
Ossi Herrala 2014-03-04 14:41:32 +00:00
parent f6b9186c72
commit 80443af535
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
yum/manifests/init.pp
View file

@ -603,7 +603,10 @@ class yum::repo::puppetlabs {
$path = "fedora/f\$releasever/products/\$basearch"
}
"centos","redhat": {
$path = "el/\$releasever/products/\$basearch"
case $::operatingsystemrelease {
/^7/: { $path = "el/7/products/\$basearch" }
default: { $path = "el/\$releasever/products/\$basearch" }
}
}
default: {
fail("yum::repo::puppetlabs not supported in ${::operatingsystem}")
@ -613,7 +616,7 @@ class yum::repo::puppetlabs {
yum::repo { "puppetlabs":
descr => "Puppet Labs Packages - Products",
baseurl => "https://yum.puppetlabs.com/${path}",
gpgkey => "https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
gpgkey => "puppet:///modules/yum/keys/puppetlabs.key",
priority => "90",
}
@ -627,7 +630,10 @@ class yum::repo::puppetlabs::dependencies {
$path = "fedora/f\$releasever/dependencies/\$basearch"
}
"centos","redhat": {
$path = "el/\$releasever/dependencies/\$basearch"
case $::operatingsystemrelease {
/^7/: { $path = "el/7/products/\$basearch" }
default: { $path = "el/\$releasever/products/\$basearch" }
}
}
default: {
fail("yum::repo::puppetlabs::dependencies not supported in ${::operatingsystem}")
@ -637,7 +643,7 @@ class yum::repo::puppetlabs::dependencies {
yum::repo { "puppetlabs-dependencies":
descr => "Puppet Labs Packages - Dependencies",
baseurl => "https://yum.puppetlabs.com/${path}",
gpgkey => "https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs",
gpgkey => "puppet:///modules/yum/keys/puppetlabs.key",
priority => "90",
}