rename smartd::defaults -> smartd::params

To better adhere to the current defacto naming conventions.
samuraiii · May 15, 2013 · 096eb58 · 096eb58
1 parent 65fdc06
commit 096eb58
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,8 +1,7 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
-#PuppetLint.configuration.send("disable_class_inherits_from_params_class")
-#PuppetLint.configuration.send("disable_variable_scope")
+PuppetLint.configuration.send("disable_class_inherits_from_params_class")
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", 'tests/**/*.pp']
 
 task :default => [:spec, :lint]
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -100,18 +100,18 @@
 #
 
 class smartd ($ensure       = 'present',
-              $autoupdate         = $smartd::defaults::autoupdate,
-              $package_name       = $smartd::defaults::package_name,
-              $service_name       = $smartd::defaults::service_name,
-              $config_file        = $smartd::defaults::config_file,
-              $devicescan         = $smartd::defaults::devicescan,
-              $devicescan_options = $smartd::defaults::devicescan_options,
-              $devices            = $smartd::defaults::devices,
-              $device_opts        = $smartd::defaults::device_opts,
-              $mail_to            = $smartd::defaults::mail_to,
-              $warning_schedule   = $smartd::defaults::warning_schedule,
-              $enable_monit       = $smartd::defaults::enable_monit,
-            ) inherits smartd::defaults {
+              $autoupdate         = $smartd::params::autoupdate,
+              $package_name       = $smartd::params::package_name,
+              $service_name       = $smartd::params::service_name,
+              $config_file        = $smartd::params::config_file,
+              $devicescan         = $smartd::params::devicescan,
+              $devicescan_options = $smartd::params::devicescan_options,
+              $devices            = $smartd::params::devices,
+              $device_opts        = $smartd::params::device_opts,
+              $mail_to            = $smartd::params::mail_to,
+              $warning_schedule   = $smartd::params::warning_schedule,
+              $enable_monit       = $smartd::params::enable_monit,
+            ) inherits smartd::params {
   case $ensure {
     'present': {
       if $autoupdate {

diff --git a/manifests/defaults.pp → manifests/params.pp b/manifests/defaults.pp → manifests/params.pp
@@ -1,4 +1,4 @@
-# == Class: smartd::defaults
+# == Class: smartd::params
 #
 # Provides parameters for the smartd module
 #
@@ -13,7 +13,7 @@
 # Copyright (C) 2013 Joshua Hoblitt
 #
 
-class smartd::defaults {
+class smartd::params {
   $autoupdate         = false
   $package_name       = 'smartmontools'
   $service_name       = 'smartd'