Browse Source

stop including params everywhere

Morgan Haskel 9 years ago
parent
commit
501a1b5627
6 changed files with 0 additions and 11 deletions
  1. 0 2
      manifests/conf.pp
  2. 0 2
      manifests/pin.pp
  3. 0 1
      manifests/ppa.pp
  4. 0 3
      manifests/release.pp
  5. 0 2
      manifests/source.pp
  6. 0 1
      manifests/update.pp

+ 0 - 2
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}":

+ 0 - 2
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) {

+ 0 - 1
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

+ 0 - 3
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":

+ 0 - 2
manifests/source.pp

@@ -18,8 +18,6 @@ define apt::source(
   $architecture      = undef,
   $trusted_source    = false,
 ) {
-
-  include apt::params
   include apt::update
 
   validate_string($architecture)

+ 0 - 1
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