Also add v4addrs and v6addrs to nodeinfo

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 75e9c881b7e94badf0565f7c8f282736efd28400..ff447e89b1ac0cdb84df010c0790361fdc2e0a2c 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -14,11 +14,17 @@ module Puppet::Parser::Functions
     if fqdn and fqdn == host
       v4ips = lookupvar('v4ips')
       if v4ips
+        results['misc']['v4addrs'] = v4ips.split(',')
+
         # find out if we are behind nat
-        v4addrs = v4ips.split(',')
-        intersection = v4addrs & results['ldap']['ipHostNumber']
+        intersection = results['misc']['v4addrs'] & results['ldap']['ipHostNumber']
         results['misc']['natted'] = intersection.empty?
       end
+
+      v6ips = lookupvar('v6ips')
+      if v6ips and v6ips != "no"
+        results['misc']['v6addrs'] = v6ips.split(',')
+      end
     end
 
     return(results)