]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Minor fixes
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 4 Jun 2013 15:20:14 +0000 (12:20 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 4 Jun 2013 15:20:14 +0000 (12:20 -0300)
manifests/subsystem/monitor.pp

index 2c0d01953e35a5895332be273b9aff06c8a64bbf..e57d177045d49f16be6a381e18c64823fdd58cc9 100644 (file)
@@ -1,15 +1,16 @@
 class nodo::subsystem::monitor(
   $use_nagios    = hiera('nodo::subsystem::monitor::use_nagios',    True),
+  $address       = hiera('nodo::subsystem::monitor::address',       $::ipaddress),
+  $check_command = hiera('nodo::subsystem::monitor::check_command', 'check_ping'),
   $check_ping    = hiera('nodo::subsystem::monitor::check_ping',    present),
   $check_ssh     = hiera('nodo::subsystem::monitor::check_ssh',     absent),
-  $address       = hiera('nodo::subsystem::monitor::address',       $::ipaddress),
-  $ping_rate     = hiera('nodo::subsystem::monitor::ping_rate',     '!100.0,20%!500.0,60%'),
-  $check_command = hiera('nodo::subsystem::monitor::check_command', 'check_ping')
+  $ping_rate     = hiera('nodo::subsystem::monitor::ping_rate',     '!100.0,20%!500.0,60%')
 ) {
 
   if $use_nagios != false {
     class{ 'nagios::target':
-      address => $address,
+      address       => $address,
+      check_command => $check_command,
     }
 
     nagios::service::ping { "${::fqdn}":