Try to generalize the ldap lookups into a single module

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

diff --git a/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
index 922f604..0b072de 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb
@@ -1,28 +1,5 @@
 module Puppet::Parser::Functions
   newfunction(:allnodeinfo, :type => :rvalue) do |attributes|
-
-    unless attributes.include?('hostname')
-      attributes << 'hostname'
-    end
-
-    ldap = LDAP::SSLConn.new('db.debian.org', 636)
-
-    results = []
-    filter = '(hostname=*)'
-    begin
-      ldap.search2('ou=hosts,dc=debian,dc=org', LDAP::LDAP_SCOPE_SUBTREE, filter, attrs=attributes, false, 0, 0, s_attr="hostname").each do |x|
-        # If a returned value doesn't have all the attributes we're searching for, skip
-        # We'll skip if the array is empty, but we also seem to get back a nil object for empty attributes sometimes
-        next if attributes.any?{ |a|  not x[a] or x[a].empty? }
-        results << x
-      end
-    rescue LDAP::ResultError
-      raise Puppet::ParseError, "LDAP error"
-    rescue RuntimeError
-      raise Puppet::ParseError, "No data returned from search"
-    ensure
-      ldap.unbind
-    end
-    return(results)
+    return Puppet::Parser::Functions::ldapinfo('*', attributes)
   end
 end