From: Bryan Jen Date: Tue, 7 Jun 2016 16:20:12 +0000 (-0700) Subject: Merge pull request #610 from puppetlabs/unused-lsb X-Git-Tag: 2.3.0~11 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5476d9033bfee6807800b1d14c8bbb9da4b4c01c;hp=efbe46bbc12f6a8c78343d95713abaf895f6e5c7;p=puppet-modules%2Fpuppetlabs-apt.git Merge pull request #610 from puppetlabs/unused-lsb apt/params: Remove unused LSB facts --- diff --git a/manifests/params.pp b/manifests/params.pp index 179e2d6..b75a0e7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,9 +10,6 @@ class apt::params { $xfacts = { 'lsbdistcodename' => $::lsbdistcodename, 'lsbdistrelease' => $::lsbdistrelease, - 'lsbmajdistrelease' => $::lsbmajdistrelease, - 'lsbdistdescription' => $::lsbdistdescription, - 'lsbminordistrelease' => $::lsbminordistrelease, 'lsbdistid' => $::lsbdistid, } } else { @@ -26,18 +23,6 @@ class apt::params { 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,