stop including params everywhere

diff --git a/manifests/conf.pp b/manifests/conf.pp
index 318422e29323933eb2b8f3d315037e421d4d1a4c..c37cf6b804140d466fa1e78e1b2704a29413b321 100644 (file)
--- a/manifests/conf.pp
+++ b/manifests/conf.pp
@@ -4,8 +4,6 @@ define apt::conf (
   $priority = '50'
 ) {
 
-  include apt::params
-
   $apt_conf_d = $apt::params::apt_conf_d
 
   file { "${apt_conf_d}/${priority}${name}":

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 935dc226e55bdffb7adebefec965d7b4935859c1..a6e3cf8e29cceebd65a772cf42525a2d2f8d0375 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -16,8 +16,6 @@ define apt::pin(
   $originator      = '', # o=
   $label           = ''  # l=
 ) {
-  include apt::params
-
   $preferences_d = $apt::params::preferences_d
 
   if $order != '' and !is_integer($order) {

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 0fdcc95f3a9902ea7f1335a6219823e146f7dc48..f6c7373d8d3c599c5126d980f2136a47766e67e7 100644 (file)
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -5,7 +5,6 @@ define apt::ppa(
   $release = $::lsbdistcodename,
   $options = $apt::params::ppa_options,
 ) {
-  include apt::params
   include apt::update
 
   $sources_list_d = $apt::params::sources_list_d

diff --git a/manifests/release.pp b/manifests/release.pp
index ae12dd4fb20cfccd48904ff84363ab16903c1ffd..d4760180f70adab44484be8b1db405a1603d94c2 100644 (file)
--- a/manifests/release.pp
+++ b/manifests/release.pp
@@ -3,9 +3,6 @@
 class apt::release (
   $release_id
 ) {
-
-  include apt::params
-
   $root = $apt::params::root
 
   file { "${root}/apt.conf.d/01release":

diff --git a/manifests/source.pp b/manifests/source.pp
index f6647dfe76b1021e645871711d6a8e9a11b6af57..3e9414f11db8121fccae496092455512565a32e0 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -18,8 +18,6 @@ define apt::source(
   $architecture      = undef,
   $trusted_source    = false,
 ) {
-
-  include apt::params
   include apt::update
 
   validate_string($architecture)

diff --git a/manifests/update.pp b/manifests/update.pp
index d9b338d952a23bfef373dd987d151ef8a2467fab..26790ceafa8a34391336a4430111cdbc08ff65f0 100644 (file)
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -1,5 +1,4 @@
 class apt::update {
-  include apt::params
   #TODO: to catch if $::apt_update_last_success has the value of -1 here. If we
   #opt to do this, a info/warn would likely be all you'd need likely to happen
   #on the first run, but if it's not run in awhile something is likely borked