X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=f4489cdcb5556e45008b62985f493308168126ed;hb=4fa28203b9ca3f12395d0d81df5a690063fc2b47;hp=8799f7b98e8be829aaa1bd741b042da9a73f8a37;hpb=ea4f615735d5fb6bb6b0fcbd735da76e0bb45c06;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/params.pp b/manifests/params.pp
index 8799f7b..f4489cd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,7 +1,35 @@
 class apt::params {
 
-  if $caller_module_name and $caller_module_name != $module_name {
-    fail('apt::params is a private class and cannot be accessed directly')
+  if $::osfamily != 'Debian' {
+    fail('This module only works on Debian or derivatives like Ubuntu')
+  }
+
+  # Strict variables facts lookup compatibility
+  $xfacts = {
+    'lsbdistcodename' => defined('$lsbdistcodename') ? {
+      true    => $::lsbdistcodename,
+      default => undef,
+    },
+    'lsbdistrelease' => defined('$lsbdistrelease') ? {
+      true    => $::lsbdistrelease,
+      default => undef,
+    },
+    'lsbmajdistrelease' => defined('$lsbmajdistrelease') ? {
+      true    => $::lsbmajdistrelease,
+      default => undef,
+    },
+    'lsbdistdescription' => defined('$lsbdistdescription') ? {
+      true    => $::lsbdistdescription,
+      default => undef,
+    },
+    'lsbminordistrelease' => defined('$lsbminordistrelease') ? {
+      true    => $::lsbminordistrelease,
+      default => undef,
+    },
+    'lsbdistid' => defined('$lsbdistid') ? {
+      true    => $::lsbdistid,
+      default => undef,
+    },
   }
 
   $root           = '/etc/apt'
@@ -11,10 +39,7 @@ class apt::params {
   $conf_d         = "${root}/apt.conf.d"
   $preferences    = "${root}/preferences"
   $preferences_d  = "${root}/preferences.d"
-
-  if $::osfamily != 'Debian' {
-    fail('This module only works on Debian or derivatives like Ubuntu')
-  }
+  $keyserver      = 'keyserver.ubuntu.com'
 
   $config_files = {
     'conf'   => {
@@ -52,30 +77,29 @@ class apt::params {
   }
 
   $source_key_defaults = {
-    'server'  => $default_keyserver,
+    'server'  => $keyserver,
     'options' => undef,
     'content' => undef,
     'source'  => undef,
   }
 
-  $file_defaults = {
-    'owner' => 'root',
-    'group' => 'root',
-    'mode'  => '0644',
+  $include_defaults = {
+    'deb' => true,
+    'src' => false,
   }
 
-  case $::lsbdistid {
+  case $xfacts['lsbdistid'] {
     'ubuntu', 'debian': {
-      $distid = $::lsbdistid
-      $distcodename = $::lsbdistcodename
+      $distid = $xfacts['lsbdistid']
+      $distcodename = $xfacts['lsbdistcodename']
     }
     'linuxmint': {
-      if $::lsbdistcodename == 'debian' {
+      if $xfacts['lsbdistcodename'] == 'debian' {
         $distid = 'debian'
         $distcodename = 'wheezy'
       } else {
         $distid = 'ubuntu'
-        $distcodename = $::lsbdistcodename ? {
+        $distcodename = $xfacts['lsbdistcodename'] ? {
           'qiana'  => 'trusty',
           'petra'  => 'saucy',
           'olivia' => 'raring',
@@ -84,7 +108,7 @@ class apt::params {
         }
       }
     }
-    '': {
+    undef: {
       fail('Unable to determine lsbdistid, is lsb-release installed?')
     }
     default: {
@@ -112,5 +136,9 @@ class apt::params {
         }
       }
     }
+    '', default: {
+      $ppa_options = undef
+      $ppa_package = undef
+    }
   }
 }