X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=a859174a1aaef9296a74bc8ec8c6acd51d096f1a;hb=1b07921c0c59dcf77987ac29c21d9909dfdb38f5;hp=ce801bc76c90c793230ae874c89bb7b86c2ca5d6;hpb=5f1cf4a24593b01a04c8886802553c1be2ec48ed;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index ce801bc..a859174 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -4,7 +4,7 @@ define apt::source( $ensure = present, $location = '', - $release = $lsbdistcodename, + $release = 'UNDEF', $repos = 'main', $include_src = true, $required_packages = false, @@ -21,8 +21,14 @@ define apt::source( $sources_list_d = $apt::params::sources_list_d $provider = $apt::params::provider - if $release == undef { - fail('lsbdistcodename fact not available: release parameter required') + if $release == 'UNDEF' { + if $::lsbdistcodename == undef { + fail('lsbdistcodename fact not available: release parameter required') + } else { + $release_real = $::lsbdistcodename + } + } else { + $release_real = $release } file { "${name}.list": @@ -52,8 +58,9 @@ define apt::source( if ($required_packages != false) and ($ensure == 'present') { exec { "Required packages: '${required_packages}' for ${name}": command => "${provider} -y install ${required_packages}", - subscribe => File["${name}.list"], + logoutput => 'on_failure', refreshonly => true, + subscribe => File["${name}.list"], } }