X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=4927002df77436543eeec411872e47ec9d8b7b4f;hb=04b5e988827426548ea98b4321392704462c0064;hp=58fbd8f7e8d0962adc638a0a29e959ec5bb9acce;hpb=a443c80220d8dacd9ec1d2eb6a03cdea0cfebf3c;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 58fbd8f7e..4927002df 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,22 +3,24 @@ module Puppet::Parser::Functions
     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/whohosts.rb'
-
-      nodeinfo         = function_yamlinfo(host, yamlfile)
-      nodeinfo['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")
+      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'))
 
       if lookupvar('::mta') == 'exim4'
         unless nodeinfo['heavy_exim']
           nodeinfo['smarthost'] = 'mailout.debian.org'
         end
+      elsif lookupvar('::mta') == 'postfix'
+        unless nodeinfo['heavy_postfix']
+          nodeinfo['smarthost'] = 'mailout.debian.org'
+        end
       end
 
       nodeinfo['misc'] = {}
@@ -39,14 +41,14 @@ module Puppet::Parser::Functions
         end
       end
 
-      ns = function_hiera('nameservers')
-      allow_dns_q = function_hiera('allow_dns_query')
+      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."
+          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)