From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 26 May 2009 18:23:28 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f3dbb425269f068ff11c7b1f56faf1285cf7c97a;hp=21caa4a9b20764b5b36d78d6ddeba6d11c4538aa;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 9f849ffb2..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
 
@@ -71,3 +70,5 @@ module Puppet::Parser::Functions
     return(results)
   end
 end
+
+# vim: set fdm=marker ts=2 sw=2 et: