Simplify codename handling.

Have the codename class parameter default to $::lsbdistcodename, and derive
$release from it.

diff --git a/manifests/init.pp b/manifests/init.pp
index a8510117db7186410217531a74e48800f7d4b19e..5c0738bf5fe4a68569b59bbb3525c43760167a85 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,7 @@
 # See LICENSE for the full license granted to you.
 
 class apt(
-  $codename = '',
+  $codename = $::lsbdistcodename,
   $use_volatile = false,
   $include_src = false,
   $use_next_release = false,
@@ -39,12 +39,8 @@ class apt(
 
   include lsb
 
-  # init $release, $next_release, $codename, $next_codename, $release_version
+  # init $release, $next_release, $next_codename, $release_version
   case $codename {
-    '': {
-      $codename = $::lsbdistcodename
-      $release = $::lsbdistrelease
-    }
     'n/a': {
       fail("Unknown lsbdistcodename reported by facter: '$lsbdistcodename', please fix this by setting this variable in your manifest.")
     }