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 db16133..2cdfab9 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,37 +3,26 @@ module Puppet::Parser::Functions
 
     host = args[0]
     yamlfile = args[1]
-    parser.watch_file(yamlfile)
 
-    require 'ldap'
-    require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
 
-    $KCODE = 'utf-8'
+    results         = function_yamlinfo(host, yamlfile)
+    results['ldap'] = function_ldapinfo(host, '*')
 
-    yaml = YAML.load_file(yamlfile)
-    results = {}
-
-    ['nameinfo', 'footer'].each do |detail|
-      if yaml.has_key?(detail)
-        if yaml[detail].has_key?(host)
-          results[detail] = yaml[detail][host]
-        end
+    results['misc'] = {}
+    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
 
-    ldap = LDAP::Conn.new('samosa.debian.org')
-
-    results['ldap'] = []
-    filter = '(hostname=' + host +')'
-    begin
-      ldap.search2('ou=hosts,dc=debian,dc=org', LDAP::LDAP_SCOPE_SUBTREE, filter) do |x|
-        results['ldap'] << x
-      end
-    rescue LDAP::ResultError
-    rescue RuntimeError
-    ensure
-      ldap.unbind
-    end
     return(results)
   end
 end
+
+# vim: set fdm=marker ts=2 sw=2 et: