Dont recreate nagios resources on every run

Use purging of nagios resources in a way that not
all resources are recreated on every puppetrun.

Resolves: #2327

2 files changed, 4 insertions, 20 deletions

diff --git a/puppet/modules/site_nagios/manifests/server/hostgroup.pp b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
index 6f85ca6d..25623924 100644
--- a/puppet/modules/site_nagios/manifests/server/hostgroup.pp
+++ b/puppet/modules/site_nagios/manifests/server/hostgroup.pp
@@ -1,3 +1,6 @@
+# create a nagios hostsgroup
 define site_nagios::server::hostgroup ($contact_emails) {
-  nagios_hostgroup { $name: }
+  nagios_hostgroup { $name:
+    ensure => present
+  }
 }
diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp
deleted file mode 100644
index 6815a703..00000000
--- a/puppet/modules/site_nagios/manifests/server/purge.pp
+++ /dev/null
@@ -1,19 +0,0 @@
-class site_nagios::server::purge inherits nagios::base {
-  # we don't want to get /etc/nagios3 and /etc/nagios3/conf.d
-  # purged, cause the check-mk-config-nagios3 package
-  # places its templates in /etc/nagios3/conf.d/check_mk,
-  # and check_mk -O updated it's nagios config in /etc/nagios3/conf.d/check_mk
-  File['nagios_cfgdir'] {
-    purge => false
-  }
-  File['nagios_confd'] {
-    purge => false
-  }
-
-  # only purge files in the /etc/nagios3/conf.d/ dir, not in any subdir
-  exec {'purge_conf.d':
-    command => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f -exec rm {} \;',
-    onlyif  => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f | grep -q "/etc/nagios3/conf.d"',
-    require => Package['nagios']
-  }
-}