diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-06-03 16:48:03 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-06-03 16:48:03 -0300 |
| commit | 051c4c67ca153f7f936ba9d761846390f580d7b7 (patch) | |
| tree | 57cc4782c094ae771180e3964d95d774a6fb74e3 | |
| parent | 2970d840eff89d8cc028f18cba22cfb155f54fcb (diff) | |
| download | puppet-nodo-051c4c67ca153f7f936ba9d761846390f580d7b7.tar.gz puppet-nodo-051c4c67ca153f7f936ba9d761846390f580d7b7.tar.bz2 | |
Removing nodo::vserver::use_nagios and nodo::host::use_nagios lookups
| -rw-r--r-- | manifests/base/host.pp | 3 | ||||
| -rw-r--r-- | manifests/base/vserver.pp | 3 | ||||
| -rw-r--r-- | manifests/subsystem/monitor.pp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/manifests/base/host.pp b/manifests/base/host.pp index f57aeb4..a2753c5 100644 --- a/manifests/base/host.pp +++ b/manifests/base/host.pp @@ -39,8 +39,7 @@ class nodo::base::host { # Monitoring if !defined(Class['nodo::subsystem::monitor']) { class { 'nodo::subsystem::monitor': - type => 'host', - use_nagios => hiera('nodo::host::use_nagios', True), + type => 'host', } } diff --git a/manifests/base/vserver.pp b/manifests/base/vserver.pp index 433be5a..68392ec 100644 --- a/manifests/base/vserver.pp +++ b/manifests/base/vserver.pp @@ -29,8 +29,7 @@ class nodo::base::vserver { # Nagios configuration class { 'nodo::subsystem::monitor': - type => 'vserver', - use_nagios => hiera('nodo::vserver::use_nagios', false), + type => 'vserver', } } } diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp index 8e1c4d8..b57db9d 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), - $addresss = hiera('nodo::subsystem::monitor::address', $::ipaddress), + $address = hiera('nodo::subsystem::monitor::address', $::ipaddress), $ping_rate = hiera('nodo::subsystem::monitor::ping_rate', '!100.0,20%!500.0,60%') ) { |