summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/manifests/server.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-04 15:49:58 +0100
committervarac <varacanero@zeromail.org>2014-03-04 18:59:03 +0100
commite603adab7cd31177e133487ba817300ce68a1e5c (patch)
tree4cef8d131686e28c3cbb3dbb60856b0fb447a1c7 /puppet/modules/site_nagios/manifests/server.pp
parent32217e18179687cd4adde350379c57c7f96ca59f (diff)
fix duplicate declarations in /etc/nagios3/conf.d/ on first deploy (Bug #5129)
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server.pp')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 9aae8ae8..7106c36a 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -1,9 +1,7 @@
class site_nagios::server inherits nagios::base {
# First, purge old nagios config (see #1467)
- class { 'site_nagios::server::purge':
- stage => setup
- }
+ class { 'site_nagios::server::purge': }
$nagios_hiera = hiera('nagios')
$nagiosadmin_pw = htpasswd_sha1($nagios_hiera['nagiosadmin_pw'])