X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=384c7d9aa95858913ef5d156cef21a4815223934;hb=abe628fb655a708581580999fb26875057dcb2ae;hp=c7af8ae6f4a256987459c45949c15cd3ec873316;hpb=b2a6f14054fb5d39f29be46e49cb456fb5f43b5b;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 c7af8ae6f..384c7d9aa 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -11,7 +11,6 @@ module Puppet::Parser::Functions
         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['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host'))
 
@@ -53,7 +52,7 @@ module Puppet::Parser::Functions
         nodeinfo['misc']['v6_ldap'] = nodeinfo['ldap']['ipHostNumber'].select { |x| IPAddr.new(x).ipv6? }
       end
 
-      ns = call_function('hiera',['nameservers'])
+      ns = call_function('hiera',['resolv::nameservers'])
       allow_dns_q = call_function('hiera',['allow_dns_query'])
       if ns.empty?
         # no nameservers known for this hoster