From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 25 Jun 2010 21:34:59 +0000 (+0200)
Subject: Remove draghi from nagiosmaster, create a extranrpeclient thing
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ae1fb81893bf9b0417ed8814923907aea9c751bb;p=mirror%2Fdsa-puppet.git

Remove draghi from nagiosmaster, create a extranrpeclient thing
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 49307fbfc..00a3051be 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -116,8 +116,8 @@ services:
     - spohr.debian.org
     - merikanto.debian.org
   muninmaster: spohr.debian.org
-  nagiosmaster:
-    - draghi.debian.org
+  nagiosmaster: draghi.debian.org
+  extranrpeclient:
     - tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index cd898100a..35fb7a1ab 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -48,7 +48,7 @@
 @def $HOST_NAGIOS_V4 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
           keyinfo[node][0]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
@@ -62,7 +62,7 @@
 @def $HOST_NAGIOS_V6 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
           keyinfo[node][0]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 0f8952ab8..b8a26d696 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -6,7 +6,7 @@
 <%=
 nagii = []
 localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster']
+  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
     nagii << keyinfo[node][0]['ipHostNumber']
   end
 end