X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fhas_role.rb;h=eef31b984523ad2c6f969c5598444bebb8b8e281;hb=acc06f8a3b65391b44bbb3b56b17a18bab966c22;hp=64633ced585a09de4100f5c22d058354ced56d4e;hpb=544c654f232dc48c78c38407aa8a1c97425ec131;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
index 64633ced5..eef31b984 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
@@ -1,14 +1,20 @@
 module Puppet::Parser::Functions
   newfunction(:has_role, :type => :rvalue) do |args|
-    begin
-      role = args.shift
-      roles = lookupvar('site::roles')
+      role = args[0]
+      roles = lookupvar('deprecated::roles')
       fqdn = lookupvar('fqdn')
       if not roles.include?(role)
-        error "Failed to look up missing role #{role}"
-        return False
+        err "Failed to look up missing role #{role}"
+        return false
+      end
+      case roles[role]
+        when Hash then roles[role].include?(fqdn)
+        else roles[role].map{ |k|
+               case k
+                 when Hash then k.keys.first
+                 else k
+               end
+             }.include?(fqdn)
       end
-      return roles[role].include?(fqdn)
-    end
   end
 end