rename class smartd param $schedule -> $warning_schedule to silence w…

…arning Warning: schedule is a metaparam; this value will inherit to all contained resources in the smartd definition
samuraiii · Apr 25, 2013 · 0b3f1b9 · 0b3f1b9
1 parent 89c55ce
commit 0b3f1b9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
@@ -1,13 +1,13 @@
 class smartd::defaults {
-  $autoupdate   = false
-  $package_name = 'smartmontools'
-  $service_name = 'smartd'
-  $scan         = true
-  $devices      = []
-  $device_opts  = {}
-  $mail_to      = 'root'
-  $schedule     = 'daily'	# other choices: once, diminishing
-  $enable_monit = false
+  $autoupdate         = false
+  $package_name       = 'smartmontools'
+  $service_name       = 'smartd'
+  $scan               = true
+  $devices            = []
+  $device_opts        = {}
+  $mail_to            = 'root'
+  $warning_schedule   = 'daily' # other choices: once, diminishing
+  $enable_monit       = false
   $devicescan_options = false
 
   case $::osfamily {

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,14 +1,14 @@
 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,
-              $scan         = $smartd::defaults::scan,
-              $devices      = $smartd::defaults::devices,
-              $device_opts  = $smartd::defaults::device_opts,
-              $mail_to      = $smartd::defaults::mail_to,
-              $schedule     = $smartd::defaults::schedule,
-              $enable_monit = $smartd::defaults::enable_monit,
+              $autoupdate         = $smartd::defaults::autoupdate,
+              $package_name       = $smartd::defaults::package_name,
+              $service_name       = $smartd::defaults::service_name,
+              $config_file        = $smartd::defaults::config_file,
+              $scan               = $smartd::defaults::scan,
+              $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,
               $devicescan_options = $smartd::defaults::devicescan_options,
              ) inherits smartd::defaults {
   case $ensure {

diff --git a/templates/smartd.conf b/templates/smartd.conf
@@ -1,5 +1,5 @@
 # Managed by Puppet -- do not edit!
-DEFAULT -m <%= @mail_to %> -M <%= @schedule %>
+DEFAULT -m <%= @mail_to %> -M <%= @warning_schedule %>
 <% if @scan -%>
 DEVICESCAN <% if @devicescan_options %><%= @devicescan_options %><% end %>
 <% end -%>