diff options
| author | varac <varacanero@zeromail.org> | 2014-02-24 13:45:50 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-27 18:12:15 +0100 |
| commit | 2b875d23a3d2a53c9276dfee1a71085967dec4c0 (patch) | |
| tree | a05f6f418e0a347a46d7593aef66fab88aa95bb7 /puppet/modules/site_nagios | |
| parent | f8e01ef3c5cc725a685f03869d8d821176181baa (diff) | |
One monitor node for non-local environments and one for local environment (Feature #2981), wip
also, use the configured ssh port for every node
Diffstat (limited to 'puppet/modules/site_nagios')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/add_host_services.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/puppet/modules/site_nagios/manifests/add_host_services.pp b/puppet/modules/site_nagios/manifests/add_host_services.pp index 2d615ff1..279809d1 100644 --- a/puppet/modules/site_nagios/manifests/add_host_services.pp +++ b/puppet/modules/site_nagios/manifests/add_host_services.pp @@ -1,7 +1,9 @@ define site_nagios::add_host_services ( + $domain_full_suffix, $domain_internal, $ip_address, $services, + $ssh_port, $openvpn_gateway_address='' ) { $nagios_hostname = $domain_internal diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index ca38d7fc..9aae8ae8 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -7,7 +7,7 @@ class site_nagios::server inherits nagios::base { $nagios_hiera = hiera('nagios') $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) - $hosts = $nagios_hiera['hosts'] + $nagios_hosts = $nagios_hiera['hosts'] include nagios::defaults include nagios::base @@ -43,7 +43,7 @@ class site_nagios::server inherits nagios::base { group => 'nagios', } - create_resources ( site_nagios::add_host_services, $hosts ) + create_resources ( site_nagios::add_host_services, $nagios_hosts ) include site_nagios::server::apache include site_check_mk::server |