From: Stephen Gran <steve@lobefin.net>
Date: Thu, 2 Jan 2014 20:17:19 +0000 (+0000)
Subject: try to fix nagios template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1ef5d32e93c4c8e455c436e944c49e755389bb56;p=mirror%2Fdsa-puppet.git

try to fix nagios template

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 3c5819f78..dffba5ac9 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,10 +5,12 @@
 
 <%=
 nagii = []
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-  if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
-    nagii << scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber']
-  end
+roles = scope.lookupvar('site::roles')
+roles['nagiosmaster'].each do |nag|
+	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+end
+roles['extranrpeclient'].each do |nag|
+	nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
 end
 
 case fqdn when
@@ -16,7 +18,7 @@ case fqdn when
     nagii << '192.34.35.49'
 end
 
-out = "allowed_hosts=" + nagii.join(',')
+out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
 out
 %>