Yay, puppet limitations

diff --git a/manifests/site.pp b/manifests/site.pp
index 920ebfa77ec441ffed3bda5a17c69ef88a88ff1e..e9ca319243a0cf36562da22a7cb83ebbcbb46420 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $allnodeinfo = allnodeinfo(["sshRSAHostKey", "ipHostNumber"], ["purpose"])
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hosterinfo}")
 

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
index 85a0c749b39c9b59957a6f298a7b5a2cf0153933..a71617e53aff13b6a802f5eb51901352aaf10174 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb
@@ -1,7 +1,7 @@
 module Puppet::Parser::Functions
   newfunction(:allnodeinfo, :type => :rvalue) do |args|
-    required = args.shift
-    optional = args.shift
+    required = args.shift.split()
+    optional = args.shift.split()
 
     allhosts = function_ldapinfo('*', required+optional )
     res = {}