From 1171ed8e99ab351e96e9a9c88cde17df261668bb Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 4 Jun 2013 12:20:14 -0300 Subject: Minor fixes --- manifests/subsystem/monitor.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp index 2c0d019..e57d177 100644 --- a/manifests/subsystem/monitor.pp +++ b/manifests/subsystem/monitor.pp @@ -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}": -- cgit v1.2.3