X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=8126c02be5ccb487776ce3d28071bcf2afa9d563;hb=4936cc3ed58840893ee27ce65a451fc0aa162d65;hp=8fd658b90d6761c02b423662271523cc97afa27e;hpb=7ddd7fd53f0292535928afbf9d90257702a1aff5;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/params.pp b/manifests/params.pp index 8fd658b..8126c02 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -39,6 +39,7 @@ class apt::params { $update_defaults = { 'frequency' => 'reluctantly', + 'loglevel' => undef, 'timeout' => undef, 'tries' => undef, } @@ -72,16 +73,9 @@ class apt::params { case $facts['os']['name']{ 'Debian': { case $facts['os']['release']['full'] { - '6.0': { - $backports = { - 'location' => 'http://httpredir.debian.org/debian-backports', - 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', - 'repos' => 'main contrib non-free', - } - } default: { $backports = { - 'location' => 'http://httpredir.debian.org/debian', + 'location' => 'http://deb.debian.org/debian', 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', 'repos' => 'main contrib non-free', } @@ -108,7 +102,7 @@ class apt::params { $ppa_options = '-y' $ppa_package = 'python-software-properties' } - '14.04', '14.10', '15.04', '15.10': { + '14.04', '14.10', '15.04', '15.10', '16.04': { $ppa_options = '-y' $ppa_package = 'software-properties-common' } @@ -119,7 +113,7 @@ class apt::params { } } undef: { - fail('Unable to determine full release number') + fail('Unable to determine value for fact os["name"]') } default: { $ppa_options = undef