X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=0695fdf9c27d39f194770aeda1408a2eccc38441;hb=1564a50936c74b7621173985fb6bb6d34c697989;hp=cca270c5aec2ab041452a8d56ac2d656dcece977;hpb=16eed32a3024a77e67ff9cab8e0126d3777484d1;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 cca270c5a..0695fdf9c 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -12,8 +12,10 @@ module Puppet::Parser::Functions
       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']
@@ -39,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