In ruby, this must be an array

[dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 7e84414b06d9569c0d64007abd60166bcba13f47..7b960e71fe3d86f0c9eae62f50a14d8c37ec4779 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