From bca9104c33e9f202ebb7ca3c40daf8facac0f11c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 3 Sep 2010 14:58:10 +0200 Subject: [PATCH] Improve on nodeinfo (i.e. make it work) --- .../puppet/lib/puppet/parser/functions/nodeinfo.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index c946206a5..2cdfab9a6 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -10,10 +10,16 @@ module Puppet::Parser::Functions results['ldap'] = function_ldapinfo(host, '*') results['misc'] = {} - # find out if we are behind nat - v4addrs = $v4ips.split(',') - intersection = v4addrs & nodeinfo['ldap']['ipHostNumber'] - results['misc']['natted'] = intersection.empty? + fqdn = lookupvar('fqdn') + if fqdn and fqdn == host + v4ips = lookupvar('v4ips') + if v4ips + # find out if we are behind nat + v4addrs = v4ips.split(',') + intersection = v4addrs & results['ldap']['ipHostNumber'] + results['misc']['natted'] = intersection.empty? + end + end return(results) end -- 2.20.1