From 0e52e6aa5479898d3d4def11bbe3479fd1c47628 Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Mon, 21 Jul 2014 15:15:01 +0300 Subject: [PATCH] yum: Fixed yum::cron::download for CentOS 7. --- yum/manifests/init.pp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp index c34372f..d7c193b 100644 --- a/yum/manifests/init.pp +++ b/yum/manifests/init.pp @@ -32,7 +32,7 @@ class yum::updatesd { # class yum::cron::download { - include yum::plugin::downloadonly + require yum::plugin::downloadonly cron { "yum-cron-download": ensure => present, @@ -40,7 +40,6 @@ class yum::cron::download { user => "root", hour => 3, minute => fqdn_rand(60), - require => Package["yum-plugin-downloadonly"], } } @@ -78,7 +77,8 @@ class yum::plugin::downloadonly { "centos","redhat": { $package = $::operatingsystemrelease ? { /^[1-5]/ => "yum-downloadonly", - default => "yum-plugin-downloadonly", + /^6/ => "yum-plugin-downloadonly", + default => undef, } } default: { @@ -86,9 +86,11 @@ class yum::plugin::downloadonly { } } - package { "yum-plugin-downloadonly": - ensure => installed, - name => $package, + if $package { + package { "yum-plugin-downloadonly": + ensure => installed, + name => $package, + } } }