Puppet not always reloading its functions is really really annoying

[mirror/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 75e9c88..f43ef25 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,23 +5,45 @@ 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, '*')
+    nodeinfo         = function_yamlinfo(host, yamlfile)
+    nodeinfo['ldap'] = function_ldapinfo(host, '*')
+    unless nodeinfo['ldap']['ipHostNumber']
+      raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
+    end
+    nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
 
-    results['misc'] = {}
+    nodeinfo['misc'] = {}
     fqdn = lookupvar('fqdn')
     if fqdn and fqdn == host
       v4ips = lookupvar('v4ips')
       if v4ips
+        nodeinfo['misc']['v4addrs'] = v4ips.split(',')
+
         # find out if we are behind nat
-        v4addrs = v4ips.split(',')
-        intersection = v4addrs & results['ldap']['ipHostNumber']
-        results['misc']['natted'] = intersection.empty?
+        intersection = nodeinfo['misc']['v4addrs'] & nodeinfo['ldap']['ipHostNumber']
+        nodeinfo['misc']['natted'] = intersection.empty?
+      end
+
+      v6ips = lookupvar('v6ips')
+      if v6ips and v6ips != "no"
+        nodeinfo['misc']['v6addrs'] = v6ips.split(',')
       end
     end
 
-    return(results)
+    if not nodeinfo['hoster']['nameservers'] or nodeinfo['hoster']['nameservers'].empty?
+      # no nameservers known for this hoster
+      nodeinfo['misc']['resolver-recursive'] = true
+    elsif (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0 or
+          (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0
+      # this host is listed as a nameserver at this location
+      nodeinfo['misc']['resolver-recursive'] = true
+    else
+      nodeinfo['misc']['resolver-recursive'] = false
+    end
+
+    return(nodeinfo)
   end
 end