From 2970d840eff89d8cc028f18cba22cfb155f54fcb Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 3 Jun 2013 16:07:52 -0300
Subject: Adding multitail into nodo::utils

---
 manifests/subsystem/monitor.pp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'manifests/subsystem')

diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp
index 59e453e..8e1c4d8 100644
--- a/manifests/subsystem/monitor.pp
+++ b/manifests/subsystem/monitor.pp
@@ -1,7 +1,7 @@
 class nodo::subsystem::monitor(
   $type       = 'vserver',
   $use_nagios = hiera('nodo::subsystem::monitor::use_nagios', True),
-  $use_fqdn   = hiera('nodo::subsystem::monitor::use_nagios_fqdn', false),
+  $addresss   = hiera('nodo::subsystem::monitor::address',    $::ipaddress),
   $ping_rate  = hiera('nodo::subsystem::monitor::ping_rate', '!100.0,20%!500.0,60%')
 ) {
 
@@ -15,13 +15,11 @@ class nodo::subsystem::monitor(
     }
 
     if $type == 'host' {
-      if $use_fqdn == true {
-        include nagios::target::fqdn
+      class{ 'nagios::target':
+        address => $address,
       }
-      else {
-        include nagios::target
-      }
-      nagios::service::ping { "${::fqdn}":
+
+      nagios::service::ping { "$address":
         ping_rate => $ping_rate,
       }
     }
-- 
cgit v1.2.3