make puppetmaster a role included via hiera

[mirror/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 0d4ed33..f9ca22f 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -44,7 +44,7 @@ if restrict_ssh.include?(@hostname) then
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
-       if scope.function_has_role(['puppetmaster']) then
+       if classes.include?('roles::puppetmaster') then
                ssh4allowed << "82.195.75.75" # adayevskaya
                ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
        end