X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=76f06b9ed4bffa391ef7b3ed90bd9d74497cfc9a;hb=148b23d52d88b9a8b3e0bdd7496d99b2526190fd;hp=aeaf114dc7fe3ef1d13064e88429caf9b85912ef;hpb=65904b214d98c899f390ac6908322fc06e3aca13;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/params.pp b/manifests/params.pp
index aeaf114..76f06b9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,4 +1,7 @@
-# Setting params for the module
+# @summary Provides defaults for the Apt module parameters.
+# 
+# @api private
+#
 class apt::params {
 
   if $::osfamily != 'Debian' {
@@ -23,6 +26,7 @@ class apt::params {
   $ppas           = {}
   $pins           = {}
   $settings       = {}
+  $manage_auth_conf = true
   $auth_conf_entries = []
 
   $config_files = {
@@ -78,11 +82,15 @@ class apt::params {
     'Debian': {
           $backports = {
             'location' => 'http://deb.debian.org/debian',
-            'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
             'repos'    => 'main contrib non-free',
           }
       $ppa_options = undef
       $ppa_package = undef
+      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+        $auth_conf_owner = '_apt'
+      } else {
+        $auth_conf_owner = 'root'
+      }
     }
     'Ubuntu': {
       $backports = {
@@ -92,6 +100,11 @@ class apt::params {
       }
       $ppa_options        = '-y'
       $ppa_package        = 'software-properties-common'
+      if versioncmp($facts['os']['release']['full'], '16.04') >= 0 {
+        $auth_conf_owner = '_apt'
+      } else {
+        $auth_conf_owner = 'root'
+      }
     }
     undef: {
       fail(translate('Unable to determine value for fact os[\"name\"]'))
@@ -100,6 +113,7 @@ class apt::params {
       $ppa_options = undef
       $ppa_package = undef
       $backports   = undef
+      $auth_conf_owner = 'root'
     }
   }
 }