Unified Diff: modules/nagios/manifests/server.pp
Issue 29338054:
Issue 3638 - Use adblockplus::host to provide nagios_host definitions (Closed)
Patch Set:
Created March 10, 2016, 12:30 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/adblockplus/manifests/host/monitoringserver.pp ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/nagios/manifests/server.pp |
| diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp |
| index 32264a1d74096e4644630fa110850fb4a4a1a630..13df9e0d56b19abd82459ab2c8e006fb2ddf3bda 100644 |
| --- a/modules/nagios/manifests/server.pp |
| +++ b/modules/nagios/manifests/server.pp |
| @@ -159,27 +159,4 @@ class nagios::server( |
| create_resources(nagios_service, $services) |
| create_resources(nagios_host, $hosts) |
| create_resources(nagios_hostgroup, $hostgroups) |
| - |
| - $nagios_generic = hiera('servers') |
| - create_resources(nagios::server::generic_host, $nagios_generic) |
| - |
| - define generic_host( |
| - $ip, |
| - $ssh_public_key = undef, |
| - $role = undef, |
| - $dns = undef, |
| - $groups = [], |
| - ) { |
| - |
| - if $dns == undef { |
| - $fqdn_name = join([$name, $nagios::server::zone], '.') |
| - } else { |
| - $fqdn_name = $dns |
| - } |
| - |
| - nagios_host {$fqdn_name: |
| - use => 'generic-host', |
| - hostgroups => $groups, |
| - } |
| - } |
| } |
« no previous file with comments
|
« modules/adblockplus/manifests/host/monitoringserver.pp ('k')
|
no next file »
|
no next file with comments »
