Cleaning up nodo::subsystem::monitor

diff --git a/manifests/base/host.pp b/manifests/base/host.pp
index a2753c5ad930e3e1515a058bd77695acace16d69..f9af2e10ebf19c5112142c6fb1512886a5f6a13a 100644 (file)
--- a/manifests/base/host.pp
+++ b/manifests/base/host.pp
@@ -38,9 +38,7 @@ class nodo::base::host {
 
   # Monitoring
   if !defined(Class['nodo::subsystem::monitor']) {
-    class { 'nodo::subsystem::monitor':
-      type => 'host',
-    }
+    class { 'nodo::subsystem::monitor': }
   }
 
   # Munin configuration

diff --git a/manifests/base/vserver.pp b/manifests/base/vserver.pp
index 68392ec041a62ddaa1851d2f9df3838e7abe667c..c8fbd71631ae78fea848fa9589901918bd2427b1 100644 (file)
--- a/manifests/base/vserver.pp
+++ b/manifests/base/vserver.pp
@@ -28,9 +28,7 @@ class nodo::base::vserver {
       }
 
       # Nagios configuration
-      class { 'nodo::subsystem::monitor':
-        type => 'vserver',
-      }
+      class { 'nodo::subsystem::monitor': }
     }
   }
 

diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp
index a444479529938601c29b4c17c51c0236d96e316a..2c0d01953e35a5895332be273b9aff06c8a64bbf 100644 (file)
--- a/manifests/subsystem/monitor.pp
+++ b/manifests/subsystem/monitor.pp
@@ -1,5 +1,4 @@
 class nodo::subsystem::monitor(
-  $type          = 'vserver',
   $use_nagios    = hiera('nodo::subsystem::monitor::use_nagios',    True),
   $check_ping    = hiera('nodo::subsystem::monitor::check_ping',    present),
   $check_ssh     = hiera('nodo::subsystem::monitor::check_ssh',     absent),
@@ -9,15 +8,8 @@ class nodo::subsystem::monitor(
 ) {
 
   if $use_nagios != false {
-
-    if $type == 'vserver' {
-      include nagios::target::fqdn
-    }
-
-    if $type == 'host' {
-      class{ 'nagios::target':
-        address => $address,
-      }
+    class{ 'nagios::target':
+      address => $address,
     }
 
     nagios::service::ping { "${::fqdn}":