Revert "make this explode"

[dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 28da4aea48a897e27ba9756ba3b583bb48f07891..74dcd892bee630cf4a156a2fc2c569746266a548 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -13,11 +13,12 @@ module Puppet::Parser::Functions
         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['buildd'] = nodeinfo['ldap']['purpose'].include?('buildd')
 
       nodeinfo['misc'] = {}
-      fqdn = lookupvar('fqdn')
+      fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
-        v4ips = lookupvar('v4ips')
+        v4ips = lookupvar('::v4ips')
         if v4ips
           nodeinfo['misc']['v4addrs'] = v4ips.split(',')
 
@@ -26,8 +27,8 @@ module Puppet::Parser::Functions
           nodeinfo['misc']['natted'] = intersection.empty?
         end
 
-        v6ips = lookupvar('v6ips')
-        if v6ips and v6ips != "no"
+        v6ips = lookupvar('::v6ips')
+        if v6ips and v6ips != ""
           nodeinfo['misc']['v6addrs'] = v6ips.split(',')
         end
       end
@@ -39,8 +40,8 @@ module Puppet::Parser::Functions
         if nodeinfo['hoster']['allow_dns_query']
           raise Puppet::ParseError, "No nameservers listed for #{nodeinfo['hoster']['name']} yet we should answer somebody's queries?  That makes no sense."
         end
-      elsif (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0 or
-            (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0
+      elsif (nodeinfo['misc']['v4addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0) or
+            (nodeinfo['misc']['v6addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0)
         # this host is listed as a nameserver at this location
         nodeinfo['misc']['resolver-recursive'] = true