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 75e9c881b7e94badf0565f7c8f282736efd28400..947caf70ab97c1b58202d68aec65c5946f183d0f 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,20 +5,31 @@ 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')
     if fqdn and fqdn == host
       v4ips = lookupvar('v4ips')
       if v4ips
+        results['misc']['v4addrs'] = v4ips.split(',')
+
         # find out if we are behind nat
-        v4addrs = v4ips.split(',')
-        intersection = v4addrs & results['ldap']['ipHostNumber']
+        intersection = results['misc']['v4addrs'] & results['ldap']['ipHostNumber']
         results['misc']['natted'] = intersection.empty?
       end
+
+      v6ips = lookupvar('v6ips')
+      if v6ips and v6ips != "no"
+        results['misc']['v6addrs'] = v6ips.split(',')
+      end
     end
 
     return(results)