In allnodeinfo distinguish between mandatory and required attributes

[mirror/dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / allnodeinfo.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
index 47450d5..85a0c74 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
@@ -1,6 +1,20 @@
 module Puppet::Parser::Functions
-  newfunction(:allnodeinfo, :type => :rvalue) do |attributes|
-    attributes.unshift('*')
-    return (function_ldapinfo(attributes))
+  newfunction(:allnodeinfo, :type => :rvalue) do |args|
+    required = args.shift
+    optional = args.shift
+
+    allhosts = function_ldapinfo('*', required+optional )
+    res = {}
+    allhosts.each_pair do |hostname, host|
+        # 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 required.any?{ |a| not host[a] or host[a].empty? }
+        res[hostname] = host
+    end
+
+    return res
   end
 end
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2: