try to fix errors

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7e84414b06d9569c0d64007abd60166bcba13f47..ea1b878520d7540f5116e3827b9c8c5c95bfb341 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,7 +5,6 @@
 
 <%=
 nodeinfo = scope.lookupvar('site::nodeinfo')
-has_role = scope.function_has_role
 out = []
 
 restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost']
@@ -45,10 +44,11 @@ if restrict_ssh.include?(hostname) then
                ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
        end
 
-       if has_role('static_master') then
+       if scope.function_has_role('static_master') then
                ssh4allowed << '$HOST_STATIC_V4'
                ssh6allowed << '$HOST_STATIC_V6'
-       elsif has_role('static_source') or has_role('static_mirror') then
+       elsif scope.function_has_role('static_source') or
+             scope.function_has_role('static_mirror') then
                ssh4allowed << '$HOST_STATICMASTER_V4'
                ssh6allowed << '$HOST_STATICMASTER_V6'
        end

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb b/modules/puppetmaster/lib/puppet/parser/functions/has_role.rb
index 4527e34f862f5197de53fd894a5f308b420d1500..ecb3cabc6935d5c6612b3ee1a245578891ea8a9c 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
       roles = lookupvar('site::roles')
       fqdn = lookupvar('fqdn')
       if not roles.include?(role)
         err "Failed to look up missing role #{role}"
-        return False
+        return false
       end
       return roles[role].include?(fqdn)
     end
-  end
 end