Now that ldapinfo is returning an array, we don't need nodeinfo to make

[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 94e806c..e9b72fa 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,8 +5,8 @@ module Puppet::Parser::Functions
     yamlfile = args[1]
     parser.watch_file(yamlfile)
 
-    require 'ldap'
     require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
 
     $KCODE = 'utf-8'
 
@@ -35,7 +35,7 @@ module Puppet::Parser::Functions
     results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
 
     if yaml['host_settings'].kind_of?(Hash)
-      yaml['host_settings'].each_key do |property, values|
+      yaml['host_settings'].each_pair do |property, values|
         if values.kind_of?(Hash)
           results[property] = values[host] if values.has_key?(host)
         elsif values.kind_of?(Array)
@@ -44,19 +44,7 @@ module Puppet::Parser::Functions
       end
     end
 
-    ldap = LDAP::Conn.new('db.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
+    results['ldap'] = function_ldapinfo(host, '*')
     return(results)
   end
 end