X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=57cee5007d65ee75a21f06c4a6afa4ec315db807;hb=43ab92c4768b638edada41b801091af1a839dfba;hp=2a29b6d1be053a8a33d5fe7f6928c90e8e3ea4b8;hpb=fe228435b1c9219b7fe61e6faafe810b117fd5e4;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/params.pp b/manifests/params.pp
index 2a29b6d..57cee50 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'   => {
@@ -32,7 +57,6 @@ class apt::params {
   }
 
   $update_defaults = {
-    'always'    => false,
     'frequency' => 'reluctantly',
     'timeout'   => undef,
     'tries'     => undef,
@@ -51,24 +75,30 @@ class apt::params {
     'preferences.d'  => true,
   }
 
-  $file_defaults = {
-    'owner' => 'root',
-    'group' => 'root',
-    'mode'  => '0644',
+  $source_key_defaults = {
+    'server'  => $keyserver,
+    'options' => undef,
+    'content' => undef,
+    'source'  => undef,
   }
 
-  case $::lsbdistid {
+  $include_defaults = {
+    'deb' => true,
+    'src' => false,
+  }
+
+  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',
@@ -77,7 +107,11 @@ class apt::params {
         }
       }
     }
-    '': {
+    'Cumulus Networks': {
+      $distid = 'debian'
+      $distcodename = $::lsbdistcodename
+    }
+    undef: {
       fail('Unable to determine lsbdistid, is lsb-release installed?')
     }
     default: {
@@ -101,9 +135,13 @@ class apt::params {
         }
         default: {
           $ppa_options        = '-y'
-          $ppa_package        = 'software-properties-common'
+          $ppa_package        = 'python-software-properties'
         }
       }
     }
+    '', default: {
+      $ppa_options = undef
+      $ppa_package = undef
+    }
   }
 }