X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fallnodeinfo.rb;h=012d58eac6700a222aac4b650ed025c35968cd6c;hb=9c394a1e25602ff8a17048f2fd67ee19acf02cae;hp=47450d559e65f9ab7670febcdef26cf4b25114ed;hpb=e06b59cd9caf42918d3d1255b2ab3f7e209be0f9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
index 47450d559..012d58eac 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
@@ -1,6 +1,24 @@
 module Puppet::Parser::Functions
-  newfunction(:allnodeinfo, :type => :rvalue) do |attributes|
-    attributes.unshift('*')
-    return (function_ldapinfo(attributes))
+  newfunction(:allnodeinfo, :type => :rvalue) do |args|
+    begin
+      required = args.shift.split()
+      optional = args.shift.split()
+
+      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
+    rescue => e
+      raise Puppet::ParseError, "Error in allnodeinfo: #{e.message}\n#{e.backtrace}"
+    end
   end
 end
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2: