summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-10-07 14:16:54 +0200
committervarac <varacanero@zeromail.org>2014-10-08 22:50:26 +0200
commit36a1332f5f6e43591a47b89ec505541f84381667 (patch)
tree721ff7fecfc710c0f750037d8fac663ee94869ca /puppet
parent027c20e2b8f779086d1480048152fe06d044b216 (diff)
include different nagios::defaults classes manually (#5216)
nagios::defaults will include nagios::defaults::hostgroups which add "all" and "centos_servers" hostgroups which we don't want. Change-Id: If42faa11c167fb7305ebbb21dc358a8813afaa25
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp8
1 files changed, 7 insertions, 1 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 8cc1ae24..b195c880 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -8,8 +8,14 @@ class site_nagios::server inherits nagios::base {
$nagios_hosts = $nagios_hiera['hosts']
$domains_internal = $nagios_hiera['domains_internal']
- include nagios::defaults
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
+
class {'nagios':
# don't manage apache class from nagios, cause we already include
# it in site_apache::common