Move hosterinfo into nodeinfo

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

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index ff447e89b1ac0cdb84df010c0790361fdc2e0a2c..947caf70ab97c1b58202d68aec65c5946f183d0f 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,9 +5,14 @@ module Puppet::Parser::Functions
     yamlfile = args[1]
 
     require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
+    require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
 
     results         = function_yamlinfo(host, yamlfile)
     results['ldap'] = function_ldapinfo(host, '*')
+    unless results['ldap']['ipHostNumber']
+      raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
+    end
+    results['hoster'] = whohosts(results['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
 
     results['misc'] = {}
     fqdn = lookupvar('fqdn')