From c0a8c1cc6bdad9c826eb9d96a18ebcf592db2716 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 26 May 2009 20:15:31 +0200 Subject: [PATCH] Allow the services array to contain hostlists in addition to single hostnames, and make the list of services dynamic --- files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb index a25c31a73..aa641c3cf 100644 --- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb +++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb @@ -22,10 +22,9 @@ module Puppet::Parser::Functions end if yaml.has_key?('services') - ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster', 'packagesqamaster'].each do |service| - if yaml['services'].has_key?(service) - results[service] = host == yaml['services'][service] - end + yaml['services'].each_pair do |service, hostlist| + hostlist=[hostlist] unless hostlist.kind_of?(Array) + results[service] = hostlist.include?(host) end end -- 2.20.1