X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=0695fdf9c27d39f194770aeda1408a2eccc38441;hb=1564a50936c74b7621173985fb6bb6d34c697989;hp=75e9c881b7e94badf0565f7c8f282736efd28400;hpb=516dbb286709cdad70269bb0345587160f31e396;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 75e9c881b..0695fdf9c 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -1,27 +1,71 @@
 module Puppet::Parser::Functions
   newfunction(:nodeinfo, :type => :rvalue) do |args|
-
     host = args[0]
     yamlfile = args[1]
+    begin
 
-    require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
+      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']])
+      nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
+      nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
+      nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))
 
-    results['misc'] = {}
-    fqdn = lookupvar('fqdn')
-    if fqdn and fqdn == host
-      v4ips = lookupvar('v4ips')
-      if v4ips
-        # find out if we are behind nat
-        v4addrs = v4ips.split(',')
-        intersection = v4addrs & results['ldap']['ipHostNumber']
-        results['misc']['natted'] = intersection.empty?
+      if lookupvar('::mta') == 'exim4'
+        unless nodeinfo['heavy_exim']
+          nodeinfo['smarthost'] = 'mailout.debian.org'
+        end
       end
-    end
 
-    return(results)
+      nodeinfo['misc'] = {}
+      fqdn = lookupvar('::fqdn')
+      if fqdn and fqdn == host
+        v4ips = lookupvar('::v4ips')
+        if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
+          nodeinfo['misc']['v4addrs'] = v4ips.split(',')
+
+          # find out if we are behind nat
+          intersection = nodeinfo['misc']['v4addrs'] & nodeinfo['ldap']['ipHostNumber']
+          nodeinfo['misc']['natted'] = intersection.empty?
+        end
+
+        v6ips = lookupvar('::v6ips')
+        if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
+          nodeinfo['misc']['v6addrs'] = v6ips.split(',')
+        end
+      end
+
+      ns = call_function('hiera',['nameservers'])
+      allow_dns_q = call_function('hiera',['allow_dns_query'])
+      if ns.empty?
+        # no nameservers known for this hoster
+        nodeinfo['misc']['resolver-recursive'] = true
+
+        if not allow_dns_q.empty?
+          raise Puppet::ParseError, "No nameservers listed for #{nodeinfo['hoster']['name']} yet we should answer somebody's queries?  That makes no sense.  allow_dns_q: #{allow_dns_q}."
+        end
+      elsif (nodeinfo['misc']['v4addrs'] and (ns & nodeinfo['misc']['v4addrs']).size > 0) or
+            (nodeinfo['misc']['v6addrs'] and (ns & nodeinfo['misc']['v6addrs']).size > 0)
+        # this host is listed as a nameserver at this location
+        nodeinfo['misc']['resolver-recursive'] = true
+
+        if allow_dns_q.empty?
+          raise Puppet::ParseError, "Host #{host} is listed as a nameserver for #{nodeinfo['hoster']['name']} but no allow_dns_query networks are defined for this location"
+        end
+      else
+        nodeinfo['misc']['resolver-recursive'] = false
+      end
+
+      return(nodeinfo)
+    rescue => e
+      raise Puppet::ParseError, "Error in nodeinfo for node #{host}, yamlfile #{yamlfile}: #{e.message}\n#{e.backtrace}"
+    end
   end
 end