From: Stephen Gran <steve@lobefin.net>
Date: Wed, 24 Feb 2010 00:21:10 +0000 (+0000)
Subject: use the right list of hosts
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=61b06c897b8b1414469f56eea0644477a5dd2c26;p=dsa-puppet.git

use the right list of hosts

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

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 33765795..31f1bb46 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -107,8 +107,8 @@
 
 @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
@@ -120,8 +120,8 @@
 
 @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