Skip to content
Snippets Groups Projects
Commit 97c061e0 authored by Jonathan Lent's avatar Jonathan Lent
Browse files

rpm: removing package ensure on EL6

parent f2a62d42
No related branches found
No related tags found
No related merge requests found
UNRELEASED
[rpm] Remove EL6 package requires of yum-plugin-downloadonly, since
yum-3.2.29-69 includes this plugin and obsoletes the individual
package (thus putting the puppet ensure in a loop) (jlent)
release/004.051 (2015-07-24)
[os] Small fix in base::os::debian to one of the systemd-related
......
......@@ -68,15 +68,12 @@ class base::rpm {
}
# RHEL5+
default: {
# EL7 includes this plugin by default
if ($::lsbmajdistrelease != '7') {
$yumpackage = $::lsbmajdistrelease ? {
'5' => 'yum-downloadonly',
'6' => 'yum-plugin-downloadonly',
# EL6/7 includes this plugin by default
if ($::lsbmajdistrelease == '5') {
package { 'yum-downloadonly':
ensure => installed,
}
package { $yumpackage: ensure => present; }
}
# RHEL systems need this plugin enabled, due to new licensing
if ($::operatingsystem == 'RedHat') {
# enable yum rhn plugin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment