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=e74f78b67d9aab1bd5e428ca60173efde6b96018;hpb=b4f2aa2de16b46711be5ca7d0cf82160db0222b8;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 e74f78b67..3bfaa5c27 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -30,7 +30,7 @@ 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']
@@ -41,7 +41,7 @@ module Puppet::Parser::Functions
 
         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
@@ -49,6 +49,8 @@ module Puppet::Parser::Functions
         # 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'])