X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=2cdfab9a68d956010bfda534e9c18ab4266df9f1;hb=bca9104c33e9f202ebb7ca3c40daf8facac0f11c;hp=d5308184b6cebb8f484a42771517b6f508aa6dd3;hpb=02c7f4f4890f18696ce9e8094da69e8802282995;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index d5308184b..2cdfab9a6 100644
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -10,11 +10,15 @@ module Puppet::Parser::Functions
     results['ldap'] = function_ldapinfo(host, '*')
 
     results['misc'] = {}
-    if $fqdn == host
-      # 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)