Merge pull request #543 from puppetlabs/revert-542-fix_apt_params

[puppet-modules/puppetlabs-apt.git] / manifests / backports.pp

diff --git a/manifests/backports.pp b/manifests/backports.pp
index f4c5faaf8997e1ce3db5be5b518314f72f6b9f84..3cac0b5b5bc54bf7420a145231c7a1d4e94c3b5d 100644 (file)
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -4,7 +4,7 @@ class apt::backports (
   $repos    = undef,
   $key      = undef,
   $pin      = 200,
-) inherits apt::params {
+){
   if $location {
     validate_string($location)
     $_location = $location
@@ -29,18 +29,18 @@ class apt::backports (
     }
   }
 
-  if ($::apt::params::xfacts['lsbdistid'] == 'debian' or $::apt::params::xfacts['lsbdistid'] == 'ubuntu') {
+  if ($::apt::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
     unless $location {
-      $_location = $::apt::params::backports['location']
+      $_location = $::apt::backports['location']
     }
     unless $release {
-      $_release = "${::apt::params::xfacts['lsbdistcodename']}-backports"
+      $_release = "${::apt::xfacts['lsbdistcodename']}-backports"
     }
     unless $repos {
-      $_repos = $::apt::params::backports['repos']
+      $_repos = $::apt::backports['repos']
     }
     unless $key {
-      $_key =  $::apt::params::backports['key']
+      $_key =  $::apt::backports['key']
     }
   } else {
     unless $location and $release and $repos and $key {