From ff71b179b92b30b65fe91e41df91c8aaa6eaa766 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 2 Mar 2011 15:46:07 +0100 Subject: [PATCH] Also add v4addrs and v6addrs to nodeinfo --- .../lib/puppet/parser/functions/nodeinfo.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index 75e9c881..ff447e89 100644 --- 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) -- 2.39.2