Improve on nodeinfo (i.e. make it work)

[mirror/dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index d530818..2cdfab9 100644 (file)
--- 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)