From 17f67d9fac83193f4436e82fc6046e065d9ab024 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 2 Jan 2013 16:54:03 +0100 Subject: Simplify codename handling. Have the codename class parameter default to $::lsbdistcodename, and derive $release from it. --- manifests/init.pp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index a851011..5c0738b 100644 --- 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.") } -- cgit v1.2.3