diff options
| author | varac <varacanero@zeromail.org> | 2014-10-07 13:55:58 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-10-08 22:50:16 +0200 |
| commit | 027c20e2b8f779086d1480048152fe06d044b216 (patch) | |
| tree | 1c561a9629eb7d6b3298de3321b2da20d255a03a /puppet/modules/site_nagios/manifests | |
| parent | 7bc79e68e5ca913d1d2843c48cde8f946feed09c (diff) | |
every environment is defined as nagios hostsgroup (#5216)
Change-Id: I6508ce0d06b37a1c5601a0e981a59f7fda47f76a
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server/hostgroup.pp | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index 85443917..8cc1ae24 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -3,9 +3,10 @@ class site_nagios::server inherits nagios::base { # First, purge old nagios config (see #1467) class { 'site_nagios::server::purge': } - $nagios_hiera = hiera('nagios') - $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) - $nagios_hosts = $nagios_hiera['hosts'] + $nagios_hiera = hiera('nagios') + $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) + $nagios_hosts = $nagios_hiera['hosts'] + $domains_internal = $nagios_hiera['domains_internal'] include nagios::defaults include nagios::base @@ -55,4 +56,6 @@ class site_nagios::server inherits nagios::base { 'set missingok missingok', 'set ifempty notifempty', 'set copytruncate copytruncate' ] } + + ::site_nagios::server::hostgroup { $domains_internal: } } diff --git a/puppet/modules/site_nagios/manifests/server/hostgroup.pp b/puppet/modules/site_nagios/manifests/server/hostgroup.pp new file mode 100644 index 00000000..035ba7d1 --- /dev/null +++ b/puppet/modules/site_nagios/manifests/server/hostgroup.pp @@ -0,0 +1,3 @@ +define site_nagios::server::hostgroup { + nagios_hostgroup { $name: } +} |