projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support to hashes for has_role
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
lib
/
puppet
/
parser
/
functions
/
has_role.rb
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
index
5c1af8e
..
427440f
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
@@
-7,11
+7,14
@@
module Puppet::Parser::Functions
err "Failed to look up missing role #{role}"
return false
end
err "Failed to look up missing role #{role}"
return false
end
- return roles[role].map{ |k|
- case k
- when Hash then k.keys.first
- else k
- end
- }.include?(fqdn)
- 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
+ end
end
end