Remove apt::key was wrong, we only need to remove the requirement

[puppet-modules/puppetlabs-apt.git] / manifests / params.pp

diff --git a/manifests/params.pp b/manifests/params.pp
index bcff6bd40d293cde5ed273e6d55495b2a252075a..8126c02be5ccb487776ce3d28071bcf2afa9d563 100644 (file)
--- 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'
         }