From: JT (Jonny) <jonathan.tripathy@puppetlabs.com>
Date: Mon, 22 Jun 2015 15:00:39 +0000 (+0100)
Subject: Merge pull request #542 from infopro-digital/fix_apt_params
X-Git-Tag: 2.2.0~12
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8f5cb7341ae362442dfd8e06129d39583f588bf0;hp=a1907ff5a61d565fc27a32f1ea4d9eab60402b8a;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #542 from infopro-digital/fix_apt_params

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

diff --git a/manifests/backports.pp b/manifests/backports.pp
index 3cac0b5..f4c5faa 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::xfacts['lsbdistid'] == 'debian' or $::apt::xfacts['lsbdistid'] == 'ubuntu') {
+  if ($::apt::params::xfacts['lsbdistid'] == 'debian' or $::apt::params::xfacts['lsbdistid'] == 'ubuntu') {
     unless $location {
-      $_location = $::apt::backports['location']
+      $_location = $::apt::params::backports['location']
     }
     unless $release {
-      $_release = "${::apt::xfacts['lsbdistcodename']}-backports"
+      $_release = "${::apt::params::xfacts['lsbdistcodename']}-backports"
     }
     unless $repos {
-      $_repos = $::apt::backports['repos']
+      $_repos = $::apt::params::backports['repos']
     }
     unless $key {
-      $_key =  $::apt::backports['key']
+      $_key =  $::apt::params::backports['key']
     }
   } else {
     unless $location and $release and $repos and $key {
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index f3e2bfd..cf98fdd 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -2,15 +2,17 @@
 define apt::ppa(
   $ensure         = 'present',
   $options        = $::apt::ppa_options,
-  $release        = $::apt::xfacts['lsbdistcodename'],
+  $release        = $::apt::params::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::xfacts['lsbdistid'] == 'Debian' {
+  if $::apt::params::xfacts['lsbdistid'] == 'Debian' {
     fail('apt::ppa is not currently supported on Debian.')
   }