support multiple ports in gen tlsa

[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 64633ced585a09de4100f5c22d058354ced56d4e..c8b537f796ea85c62d7603b6cc76653db38605e4 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
@@ -1,14 +1,12 @@
 module Puppet::Parser::Functions
   newfunction(:has_role, :type => :rvalue) do |args|
-    begin
-      role = args.shift
+      role = args[0]
       roles = lookupvar('site::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
       return roles[role].include?(fqdn)
     end
-  end
 end