X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=2c26227ec44f3b4b88f33dc28674e54040dd5182;hb=ecb3a0be2315fad1c91cf1da2f97ba1093ab0376;hp=0040c14f4e9cb853b66aadf6ab5b30a15b8d52ae;hpb=2d19d8664e5e1b680deec7d487875c5d53b3ac39;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index 0040c14..2c26227 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -4,7 +4,7 @@ define apt::source( $ensure = present, $location = '', - $release = $lsbdistcodename, + $release = $::lsbdistcodename, $repos = 'main', $include_src = true, $required_packages = false, @@ -36,12 +36,13 @@ define apt::source( } - if ($pin != false) and ($ensure == 'present') { + if ($pin != false) { # Get the host portion out of the url so we can pin to origin $url_split = split($location, '/') $host = $url_split[2] apt::pin { $name: + ensure => $ensure, priority => $pin, before => File["${name}.list"], origin => $host, @@ -51,8 +52,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"], } }