X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fbackports.pp;h=1a9ea1bcaefb4c629209cc25543b9e63308d6757;hb=6004f13a3a6c1baf4612316b71abff796914789b;hp=39e6f6c0d8d81260514f56deadd53d17bd686b94;hpb=9ef0502471f2f3f23ec8f690a9968eb83b7b46cf;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/backports.pp b/manifests/backports.pp index 39e6f6c..1a9ea1b 100644 --- a/manifests/backports.pp +++ b/manifests/backports.pp @@ -7,7 +7,7 @@ # repos => 'main universe multiverse restricted', # key => { # id => '630239CC130E1A7FD81A27B140976EAF437D05B5', -# server => 'hkps.pool.sks-keyservers.net', +# server => 'keyserver.ubuntu.com', # }, # } # @@ -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 @@ -79,7 +79,11 @@ class apt::backports ( $_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']