Do not manage constants.conf

Let icinga2 node setup handle constants.conf, add global zone
definitions to zones.conf.epp and remove explicit zone and cn parameters
to node setup on master.

2 files changed, 7 insertions, 33 deletions

diff --git a/sitemodules/profiles/templates/icinga2_master/constants.conf.epp b/sitemodules/profiles/templates/icinga2_master/constants.conf.epp
deleted file mode 100644
index 0baa08c..0000000
--- a/sitemodules/profiles/templates/icinga2_master/constants.conf.epp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%- | String $ticket_salt
-| -%>
-/**
- * This file defines global constants which can be used in
- * the other configuration files.
- *
- * This file is managed by Puppet and should not be modified manually.
- */
-
-/* The directory which contains the plugins from the Monitoring Plugins project. */
-const PluginDir = "/usr/lib/nagios/plugins"
-
-/* The directory which contains the Manubulon plugins.
- * Check the documentation, chapter "SNMP Manubulon Plugin Check Commands", for details.
- */
-const ManubulonPluginDir = "/usr/lib/nagios/plugins"
-
-/* The directory which you use to store additional plugins which ITL provides user contributed command definitions for.
- * Check the documentation, chapter "Plugins Contribution", for details.
- */
-const PluginContribDir = "/usr/lib/nagios/plugins"
-
-/* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
- * This should be the common name from the API certificate.
- */
-const NodeName = "<%= $facts['fqdn'] %>"
-
-/* Our local zone name. */
-const ZoneName = "<%= $facts['fqdn'] %>"
-
-/* Secret key for remote node tickets */
-const TicketSalt = "<%= $ticket_salt %>"
diff --git a/sitemodules/profiles/templates/icinga2_master/zones.conf.epp b/sitemodules/profiles/templates/icinga2_master/zones.conf.epp
index ac74bbe..3430fae 100644
--- a/sitemodules/profiles/templates/icinga2_master/zones.conf.epp
+++ b/sitemodules/profiles/templates/icinga2_master/zones.conf.epp
@@ -6,7 +6,13 @@ object Endpoint NodeName {
 }
 
 object Zone ZoneName {
-	endpoints = [ NodeName ]
+    endpoints = [ NodeName ]
 }
 
+object Zone "global-templates" {
+    global = true
+}
 
+object Zone "director-global" {
+    global = true
+}