X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=f31b723c2dae63bc5bbda8e7ad4a3562445efb59;hb=1c07afa774f62ff6df564e37bab79ac42d7032bf;hp=0695fdf9c27d39f194770aeda1408a2eccc38441;hpb=1564a50936c74b7621173985fb6bb6d34c697989;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 0695fdf9c..f31b723c2 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -1,47 +1,48 @@
 module Puppet::Parser::Functions
   newfunction(:nodeinfo, :type => :rvalue) do |args|
+    require 'ipaddr'
+
     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']])
-      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
-      end
+      nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host'))
 
       nodeinfo['misc'] = {}
       fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
         v4ips = lookupvar('::v4ips')
         if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
-          nodeinfo['misc']['v4addrs'] = v4ips.split(',')
+          nodeinfo['misc']['v4addrs'] = v4ips.split(',').uniq()
 
           # find out if we are behind nat
           intersection = nodeinfo['misc']['v4addrs'] & nodeinfo['ldap']['ipHostNumber']
           nodeinfo['misc']['natted'] = intersection.empty?
+        else
+          nodeinfo['misc']['v4addrs'] = []
         end
 
         v6ips = lookupvar('::v6ips')
         if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
-          nodeinfo['misc']['v6addrs'] = v6ips.split(',')
+          nodeinfo['misc']['v6addrs'] = v6ips.split(',').uniq()
+        else
+          nodeinfo['misc']['v6addrs'] = []
         end
+
+        # find out if we have an ipv4 and/or an ipv6 address for our host in ldap.
+        nodeinfo['misc']['has_v4_ldap'] = nodeinfo['ldap']['ipHostNumber'].any? { |x| IPAddr.new(x).ipv4? }
+        nodeinfo['misc']['has_v6_ldap'] = nodeinfo['ldap']['ipHostNumber'].any? { |x| IPAddr.new(x).ipv6? }
+        nodeinfo['misc']['v4_ldap'] = nodeinfo['ldap']['ipHostNumber'].select { |x| IPAddr.new(x).ipv4? }
+        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