Try returning an info hash for a hoster - this will fail

[dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / whohosts.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index 780afa1d0c947c7e698be9399fecc910e14af23e..022ca895af991943211fefb06c4dc166f31b8ee1 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -9,7 +9,7 @@ module Puppet::Parser::Functions
 
     $KCODE = 'utf-8'
 
-    ans = "unknown"
+    ans = {"name": "unknown"}
     yaml = YAML.load_file(yamlfile)
 
     if (nodeinfo['ldap'].has_key?('ipHostNumber'))
@@ -24,7 +24,8 @@ module Puppet::Parser::Functions
           netrange.each do |net|
             begin
               if IPAddr.new(net).include?(addr)
-                ans = hoster
+                ans = yaml[hoster]
+                ans['name'] = hoster
               end
             rescue Exception => e
               raise "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"