X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fbackports.pp;h=0ef45333d5ae87b3cf7debd89d18b32bdf05432a;hb=refs%2Fheads%2Frelease-prep;hp=080c83dd350eb2a8027f88d691ace3f2e2f81bc8;hpb=5f91c2df3fc438538981c6bed46602c7d623a639;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/backports.pp b/manifests/backports.pp index 080c83d..0ef4533 100644 --- a/manifests/backports.pp +++ b/manifests/backports.pp @@ -21,7 +21,7 @@ # # @param release # Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. -# Default: on Debian and Ubuntu, `${facts['os']['distro']['codename']}-backports`. We recommend keeping this default, except on other operating +# Default: on Debian and Ubuntu, `${fact('os.distro.codename')}-backports`. We recommend keeping this default, except on other operating # systems. # # @param repos @@ -53,8 +53,8 @@ class apt::backports ( Optional[String] $release = undef, Optional[String] $repos = undef, Optional[Variant[String, Hash]] $key = undef, - Optional[Variant[Integer, String, Hash]] $pin = 200, - Optional[Variant[Hash]] $include = {}, + Variant[Integer, String, Hash] $pin = 200, + Variant[Hash] $include = {}, ) { include apt @@ -76,16 +76,20 @@ class apt::backports ( } } unless $location { - $_location = $::apt::backports['location'] + $_location = $apt::backports['location'] } unless $release { - $_release = "${facts['os']['distro']['codename']}-backports" + if fact('os.distro.codename') { + $_release = "${fact('os.distro.codename')}-backports" + } else { + fail('os.distro.codename fact not available: release parameter required') + } } unless $repos { - $_repos = $::apt::backports['repos'] + $_repos = $apt::backports['repos'] } unless $key { - $_key = $::apt::backports['key'] + $_key = $apt::backports['key'] } if $pin =~ Hash {