]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Remove array support
authorPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 10:49:05 +0000 (11:49 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 1 Mar 2011 10:49:05 +0000 (11:49 +0100)
modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb

index 84b618c3e6f93c05afe172e6bd800a58c2751f7a..780afa1d0c947c7e698be9399fecc910e14af23e 100644 (file)
@@ -15,13 +15,12 @@ module Puppet::Parser::Functions
     if (nodeinfo['ldap'].has_key?('ipHostNumber'))
       nodeinfo['ldap']['ipHostNumber'].each do |addr|
         yaml.keys.each do |hoster|
-          if yaml[hoster].kind_of?(Array)
-            netrange = yaml[hoster]
-          elsif yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
+          if yaml[hoster].kind_of?(Hash) and yaml[hoster].has_key?('netrange')
             netrange = yaml[hoster]['netrange']
           else
             next
           end
+
           netrange.each do |net|
             begin
               if IPAddr.new(net).include?(addr)