From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 22 Jun 2015 16:30:15 +0000 (-0700)
Subject: Revert "Fix use of $::apt::params::backports and $::apt::params::xfacts."
X-Git-Tag: 2.1.1~2^2^2~2^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=70c18639c12194e0e2c391c7b42065605510ac5a;p=puppet-modules%2Fpuppetlabs-apt.git

Revert "Fix use of $::apt::params::backports and $::apt::params::xfacts."
---

diff --git a/manifests/backports.pp b/manifests/backports.pp
index f4c5faa..3cac0b5 100644
--- 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 {
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index cf98fdd..f3e2bfd 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,17 +2,15 @@
 define apt::ppa(
   $ensure         = 'present',
   $options        = $::apt::ppa_options,
-  $release        = $::apt::params::xfacts['lsbdistcodename'],
+  $release        = $::apt::xfacts['lsbdistcodename'],
   $package_name   = $::apt::ppa_package,
   $package_manage = false,
 ) {
-  include 'apt::params'
-
   unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  if $::apt::params::xfacts['lsbdistid'] == 'Debian' {
+  if $::apt::xfacts['lsbdistid'] == 'Debian' {
     fail('apt::ppa is not currently supported on Debian.')
   }