diff options
| author | Varac <varac@leap.se> | 2014-12-04 17:30:07 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-12-04 17:30:07 +0800 |
| commit | 60bd76583d46fe1c9f39804c7fd892fa9c1745d0 (patch) | |
| tree | e938e8bc993104715c79595af313f9d8485f5125 /puppet/modules/site_nagios/manifests/server.pp | |
| parent | acd6dd2848f38ba1b728f263f297bc6d2ad9e4bb (diff) | |
| parent | a84272aa77715a4029ebd06b38b7a5ad05e6acd0 (diff) | |
Merge "Change nagios mail To: Header to contain the actual platform environment's contact email (Bug #6466)" into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index 37bd77fb..068ee419 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -6,12 +6,11 @@ class site_nagios::server inherits nagios::base { $nagios_hiera = hiera('nagios') $nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw']) $nagios_hosts = $nagios_hiera['hosts'] - $domains_internal = $nagios_hiera['domains_internal'] + $nagios_contacts = hiera('contacts') + $environment = $nagios_hiera['environments'] include nagios::base include nagios::defaults::commands - include nagios::defaults::contactgroups - include nagios::defaults::contacts include nagios::defaults::templates include nagios::defaults::timeperiods include nagios::defaults::plugins @@ -63,5 +62,7 @@ class site_nagios::server inherits nagios::base { 'set copytruncate copytruncate' ] } - ::site_nagios::server::hostgroup { $domains_internal: } + create_resources ( site_nagios::server::hostgroup, $environment ) + create_resources ( site_nagios::server::contactgroup, $environment ) + create_resources ( site_nagios::server::add_contacts, $environment ) } |