From 096eb58b18f105b3eaded66a1f2d19f1c2ab9bc8 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Wed, 15 May 2013 14:27:33 -0700 Subject: [PATCH] rename smartd::defaults -> smartd::params To better adhere to the current defacto naming conventions. --- Rakefile | 3 +-- manifests/init.pp | 24 ++++++++++++------------ manifests/{defaults.pp => params.pp} | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) rename manifests/{defaults.pp => params.pp} (94%) diff --git a/Rakefile b/Rakefile index 03d386b..f8a52a1 100644 --- 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 index 23f312b..f4c4bc7 100644 --- 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 b/manifests/params.pp similarity index 94% rename from manifests/defaults.pp rename to manifests/params.pp index 6408666..137c58b 100644 --- a/manifests/defaults.pp +++ b/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'