]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
and even more carefully this time
authorStephen Gran <steve@lobefin.net>
Tue, 23 Feb 2010 19:46:07 +0000 (19:46 +0000)
committerStephen Gran <steve@lobefin.net>
Tue, 23 Feb 2010 19:46:07 +0000 (19:46 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/ferm/templates/defs.conf.erb

index 45fd624e75546f00a6fc853e420a02d7fda066a5..33765795dc6c8b39541b55b2c2524a3e89f6cd56 100644 (file)
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
   localinfo.keys.sort.each do |node|
-      next unless (keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber'))
+      next unless (keyinfo.has_key?(node) and keyinfo[node].at(0) and 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[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber'))
+      next unless (keyinfo.has_key?(node) and keyinfo[node].at(0) and keyinfo[node][0].has_key?('ipHostNumber'))
       keyinfo[node][0]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip