From 2436fddb4a63075f74f295bacd23128c766beb4c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 17 Feb 2014 13:50:42 +0100
Subject: Remove adding of hosts from site_nagios::server (Feature #5132)

because now, check_mk will add the hosts
---
 puppet/modules/site_check_mk/manifests/server.pp   |  2 +-
 puppet/modules/site_nagios/manifests/add_host.pp   | 32 ----------------------
 .../site_nagios/manifests/add_host_services.pp     | 26 ++++++++++++++++++
 puppet/modules/site_nagios/manifests/server.pp     |  2 +-
 4 files changed, 28 insertions(+), 34 deletions(-)
 delete mode 100644 puppet/modules/site_nagios/manifests/add_host.pp
 create mode 100644 puppet/modules/site_nagios/manifests/add_host_services.pp

(limited to 'puppet/modules')

diff --git a/puppet/modules/site_check_mk/manifests/server.pp b/puppet/modules/site_check_mk/manifests/server.pp
index 625fc688..e77862e5 100644
--- a/puppet/modules/site_check_mk/manifests/server.pp
+++ b/puppet/modules/site_check_mk/manifests/server.pp
@@ -8,7 +8,7 @@ class site_check_mk::server {
 
   $nagios_hiera   = hiera_hash('nagios')
   $hosts          = $nagios_hiera['hosts']
-  $all_hosts = inline_template("<% @hosts.keys.sort.each do |key| -%>\"<%= key %>\", <% end -%>")
+  $all_hosts      = inline_template ('<% @hosts.keys.sort.each do |key| -%>"<%= @hosts[key]["domain_internal"] %>", <% end -%>')
 
   package { 'check-mk-server':
     ensure => installed,
diff --git a/puppet/modules/site_nagios/manifests/add_host.pp b/puppet/modules/site_nagios/manifests/add_host.pp
deleted file mode 100644
index 94352de4..00000000
--- a/puppet/modules/site_nagios/manifests/add_host.pp
+++ /dev/null
@@ -1,32 +0,0 @@
-define site_nagios::add_host (
-  $domain_internal,
-  $ip_address,
-  $services,
-  $openvpn_gateway_address='' ) {
-
-    $nagios_hostname = $domain_internal
-
-    # Add Nagios host
-    nagios_host { $nagios_hostname:
-      address => $ip_address,
-      use     => 'generic-host',
-    }
-
-    # Add Nagios service
-
-    # First, we need to turn the serice array into hash, using a "hash template"
-    # see https://github.com/ashak/puppet-resource-looping
-    $nagios_service_hashpart = {
-      'hostname'    => $nagios_hostname,
-      'ip_address'  => $ip_address,
-      'openvpn_gw'  => $openvpn_gateway_address,
-    }
-    $dynamic_parameters = {
-      'service' => '%s'
-    }
-    $nagios_servicename = "${nagios_hostname}_%s"
-
-    $nagios_service_hash = create_resources_hash_from($nagios_servicename, $services, $nagios_service_hashpart, $dynamic_parameters)
-
-    create_resources ( site_nagios::add_service, $nagios_service_hash )
-}
diff --git a/puppet/modules/site_nagios/manifests/add_host_services.pp b/puppet/modules/site_nagios/manifests/add_host_services.pp
new file mode 100644
index 00000000..2d615ff1
--- /dev/null
+++ b/puppet/modules/site_nagios/manifests/add_host_services.pp
@@ -0,0 +1,26 @@
+define site_nagios::add_host_services (
+  $domain_internal,
+  $ip_address,
+  $services,
+  $openvpn_gateway_address='' ) {
+
+    $nagios_hostname = $domain_internal
+
+    # Add Nagios service
+
+    # First, we need to turn the serice array into hash, using a "hash template"
+    # see https://github.com/ashak/puppet-resource-looping
+    $nagios_service_hashpart = {
+      'hostname'    => $nagios_hostname,
+      'ip_address'  => $ip_address,
+      'openvpn_gw'  => $openvpn_gateway_address,
+    }
+    $dynamic_parameters = {
+      'service' => '%s'
+    }
+    $nagios_servicename = "${nagios_hostname}_%s"
+
+    $nagios_service_hash = create_resources_hash_from($nagios_servicename, $services, $nagios_service_hashpart, $dynamic_parameters)
+
+    create_resources ( site_nagios::add_service, $nagios_service_hash )
+}
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index b1795826..ca38d7fc 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -43,7 +43,7 @@ class site_nagios::server inherits nagios::base {
     group  => 'nagios',
   }
 
-  create_resources ( site_nagios::add_host, $hosts )
+  create_resources ( site_nagios::add_host_services, $hosts )
 
   include site_nagios::server::apache
   include site_check_mk::server
-- 
cgit v1.2.3