X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=3bfaa5c27b74487a49ab6f7f28c04848211170cf;hb=30be0f0db19c688a30cc568c80be00a6724bd1e2;hp=71d5ee50e9575a116bbfaa2a01c15dc4be9f5515;hpb=1c732b4f31f2b5ea49881f4d96c1730a5c850cfb;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 71d5ee50e..3bfaa5c27 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -1,18 +1,16 @@
 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'], "/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 +19,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'] = {}
@@ -28,17 +30,27 @@ module Puppet::Parser::Functions
       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'])