From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 1 Mar 2011 09:51:18 +0000 (+0100)
Subject: Handle old and new style hosters.yaml
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=b6e6411cde70148acac94808f002753bf2a12206;p=dsa-puppet.git

Handle old and new style hosters.yaml
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index c2bda8c4..972c3bc9 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -15,10 +15,16 @@ module Puppet::Parser::Functions
     if (nodeinfo['ldap'].has_key?('ipHostNumber'))
       nodeinfo['ldap']['ipHostNumber'].each do |addr|
         yaml.keys.each do |hoster|
-          yaml[hoster].each do |net|
-            if IPAddr.new(net).include?(addr)
-              ans = hoster
-            end
+          if yaml[hoster].kind_of?(Array)
+            netrange = yaml[hoster]
+          elsif yaml[hoster].kind_of?(Array) and yaml[hoster].has_key?['netrange']
+            netrange = yaml[hoster]['netrange']
+          else
+            next
+          end
+          netrange.each do |net|
+          if IPAddr.new(net).include?(addr)
+            return hoster
           end
         end
       end
@@ -26,3 +32,6 @@ module Puppet::Parser::Functions
     return ans
   end
 end
+# vim:set ts=2:
+# vim:set et:
+# vim:set shiftwidth=2: