X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fdefs.conf.erb;h=ae637fe048a24751dea825a0569e44c738010ac6;hb=a76d22733a5fa5f9847083d16a3c9dbf6a03ddf1;hp=6c2d182fb485540901c8ecc73765483ed6ef5319;hpb=d665197bdd18c8ef6a59c466f162de630eb9218d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 6c2d182fb..ae637fe04 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -19,7 +19,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              mailrelay << ip
           end
@@ -33,7 +33,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              mailrelay << ip
           end
@@ -49,7 +49,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
           end
@@ -63,7 +63,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
           end
@@ -79,7 +79,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              munins << ip
           end
@@ -93,7 +93,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              munins << ip
           end
@@ -109,7 +109,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              dbs << ip
           end
@@ -123,7 +123,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node]['ipHostNumber'].each do |ip|
+          allnodeinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              dbs << ip
           end
@@ -137,9 +137,9 @@
 
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
-  keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node].has_key?('ipHostNumber')
-      keyinfo[node]['ipHostNumber'].each do |ip|
+  allnodeinfo.keys.sort.each do |node|
+      next unless allnodeinfo[node].has_key?('ipHostNumber')
+      allnodeinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
       end
@@ -150,9 +150,9 @@
 
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
-  keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node].has_key?('ipHostNumber')
-      keyinfo[node]['ipHostNumber'].each do |ip|
+  allnodeinfo.keys.sort.each do |node|
+      next unless allnodeinfo[node].has_key?('ipHostNumber')
+      allnodeinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip
       end