From: Daniele Sluijters <daenney@users.noreply.github.com>
Date: Thu, 19 Feb 2015 23:09:44 +0000 (+0100)
Subject: apt::params: Add two missing entries, use them.
X-Git-Tag: 2.0.0~43^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e407d70e09d1271958b82fe27a4e3a26915f707;p=puppet-modules%2Fpuppetlabs-apt.git

apt::params: Add two missing entries, use them.
---

diff --git a/manifests/conf.pp b/manifests/conf.pp
index c37cf6b..40f9c40 100644
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -4,9 +4,7 @@ define apt::conf (
   $priority = '50'
 ) {
 
-  $apt_conf_d = $apt::params::apt_conf_d
-
-  file { "${apt_conf_d}/${priority}${name}":
+  file { "${$apt::conf_d}/${priority}${name}":
     ensure  => $ensure,
     content => template('apt/_header.erb', 'apt/conf.erb'),
     owner   => root,
diff --git a/manifests/init.pp b/manifests/init.pp
index a9d3540..b82bd27 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,15 +38,9 @@ class apt(
     owner   => 'root',
   }
 
-  $root           = $apt::params::root
-  $apt_conf_d     = $apt::params::apt_conf_d
-  $sources_list_d = $apt::params::sources_list_d
-  $preferences_d  = $apt::params::preferences_d
-  $provider       = $apt::params::provider
-
   file { 'sources.list':
     ensure  => present,
-    path    => "${root}/sources.list",
+    path    => $::apt::sources_list,
     owner   => root,
     group   => root,
     mode    => '0644',
@@ -56,7 +50,7 @@ class apt(
 
   file { 'sources.list.d':
     ensure  => directory,
-    path    => $sources_list_d,
+    path    => $::apt::sources_list_d,
     owner   => root,
     group   => root,
     purge   => $purge_sources_list_d,
@@ -67,13 +61,13 @@ class apt(
   if $purge_preferences {
     file { 'apt-preferences':
       ensure => absent,
-      path   => "${root}/preferences",
+      path   => $::apt::preferences,
     }
   }
 
   file { 'preferences.d':
     ensure  => directory,
-    path    => $preferences_d,
+    path    => $::apt::preferences_d,
     owner   => root,
     group   => root,
     purge   => $purge_preferences_d,
diff --git a/manifests/params.pp b/manifests/params.pp
index aa90a7d..e7310aa 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,8 +1,10 @@
 class apt::params {
   $root           = '/etc/apt'
   $provider       = '/usr/bin/apt-get'
+  $sources_list   = "${root}/sources.list"
   $sources_list_d = "${root}/sources.list.d"
-  $apt_conf_d     = "${root}/apt.conf.d"
+  $conf_d         = "${root}/apt.conf.d"
+  $preferences    = "${root}/preferences"
   $preferences_d  = "${root}/preferences.d"
 
   if $::osfamily != 'Debian' {