no more lenny

[dsa-puppet.git] / modules / nagios / templates / inc-debian.org.erb

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 5732e2a310dadaa196b09b5d7261cbb4152ad719..3c5819f789fbece5212ee71358e1b7b4889ee558 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,14 +5,14 @@
 
 <%=
 nagii = []
-localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-    nagii << allnodeinfo[node]['ipHostNumber']
+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
 end
 
 case fqdn when
-  'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
+  'mundy.debian.org', 'caballero.debian.org' then
     nagii << '192.34.35.49'
 end