]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
use the right list of hosts
authorStephen Gran <steve@lobefin.net>
Wed, 24 Feb 2010 00:21:10 +0000 (00:21 +0000)
committerStephen Gran <steve@lobefin.net>
Wed, 24 Feb 2010 00:21:10 +0000 (00:21 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ferm/templates/defs.conf.erb

index 33765795dc6c8b39541b55b2c2524a3e89f6cd56..31f1bb464027d8f67b3de0eb48686c465e3f1c23 100644 (file)
 
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
-  localinfo.keys.sort.each do |node|
-      next unless (keyinfo.has_key?(node) and keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber'))
+  keyinfo.keys.sort.each do |node|
+      next unless keyinfo[node][0].has_key?('ipHostNumber')
       keyinfo[node][0]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
 
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
-  localinfo.keys.sort.each do |node|
-      next unless (keyinfo.has_key?(node) and keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber'))
+  keyinfo.keys.sort.each do |node|
+      next unless keyinfo[node][0].has_key?('ipHostNumber')
       keyinfo[node][0]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip