X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=4927002df77436543eeec411872e47ec9d8b7b4f;hb=c4c9a52df83e66cd9ed5039f66756529e06c6416;hp=cf8ea9dca011bdc4a996c6b53b911924ec9567ee;hpb=284a7948f13a3932a5cc58c42f1b1bc72248c5dd;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 cf8ea9dca..4927002df 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,16 +3,12 @@ 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, '*'])
       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'))
@@ -21,6 +17,10 @@ module Puppet::Parser::Functions
         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'] = {}
@@ -41,8 +41,8 @@ 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