X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=abc7536eabc2be7f6119be19645fc41689e6fb50;hb=d3ca10fd2f31d0161bcfc65c263bd044537a3c48;hp=6f7e5f9dc04dbc7d83f2a539ee9ffc7a428b92f7;hpb=37043dff8572f490fcb77317784d042d1f7a4c70;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/params.pp b/manifests/params.pp
index 6f7e5f9..abc7536 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -88,59 +88,32 @@ class apt::params {
   }
 
   case $xfacts['lsbdistid'] {
-    'ubuntu', 'debian': {
-      $distid = $xfacts['lsbdistid']
-      $distcodename = $xfacts['lsbdistcodename']
-    }
-    'linuxmint': {
-      if $xfacts['lsbdistcodename'] == 'debian' {
-        $distid = 'debian'
-        $distcodename = 'wheezy'
-      } else {
-        $distid = 'ubuntu'
-        $distcodename = $xfacts['lsbdistcodename'] ? {
-          'qiana'  => 'trusty',
-          'petra'  => 'saucy',
-          'olivia' => 'raring',
-          'nadia'  => 'quantal',
-          'maya'   => 'precise',
-        }
-      }
-    }
-    'Cumulus Networks': {
-      $distid = 'debian'
-      $distcodename = $::lsbdistcodename
-    }
-    undef: {
-      fail('Unable to determine lsbdistid, is lsb-release installed?')
-    }
-    default: {
-      fail("Unsupported lsbdistid (${::lsbdistid})")
-    }
-  }
-  case $distid {
     'debian': {
-      case $distcodename {
+      case $xfacts['lsbdistcodename'] {
         'squeeze': {
-          $backports = {'location' => 'http://backports.debian.org/debian-backports',
-                        'key'       => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
-                        'repos'     => 'main contrib non-free',
+          $backports = {
+            'location' => 'http://backports.debian.org/debian-backports',
+            'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+            'repos'    => 'main contrib non-free',
           }
         }
         default: {
-          $backports = {'location' => 'http://ftp.debian.org/debian/',
-                        'key'       => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD624692555',
-                        'repos'     => 'main contrib non-free',
+          $backports = {
+            'location' => 'http://ftp.debian.org/debian/',
+            'key'      => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
+            'repos'    => 'main contrib non-free',
           }
         }
       }
     }
     'ubuntu': {
-      $backports = {'location' => 'http://archive.ubuntu.com/ubuntu',
-                    'key'       => '630239CC130E1A7FD81A27B140976EAF437D05B5',
-                    'repos'     => 'main universe multiverse restricted',
+      $backports = {
+        'location' => 'http://archive.ubuntu.com/ubuntu',
+        'key'      => '630239CC130E1A7FD81A27B140976EAF437D05B5',
+        'repos'    => 'main universe multiverse restricted',
       }
-      case $distcodename {
+
+      case $xfacts['lsbdistcodename'] {
         'lucid': {
           $ppa_options        = undef
           $ppa_package        = 'python-software-properties'
@@ -159,9 +132,13 @@ class apt::params {
         }
       }
     }
-    '', default: {
+    undef: {
+      fail('Unable to determine lsbdistid, is lsb-release installed?')
+    }
+    default: {
       $ppa_options = undef
       $ppa_package = undef
+      $backports   = undef
     }
   }
 }