From a76d22733a5fa5f9847083d16a3c9dbf6a03ddf1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 2 Mar 2011 12:59:03 +0100 Subject: [PATCH] Yay, puppet limitations --- manifests/site.pp | 2 +- .../puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 920ebfa77..e9ca31924 100644 --- 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 85a0c749b..a71617e53 100644 --- 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 = {} -- 2.20.1