Try to avoid reserved site keyword

[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 f82aa46..73970da 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,11 +4,11 @@
 ##
 
 <%=
-nodeinfo = scope.lookupvar('site::nodeinfo')
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
 restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-ubc-01}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
        nodeinfo['ldap']['purpose'].each do |purp|
@@ -45,14 +45,6 @@ if should_restrict then
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
 
-       if scope.function_has_role(['static_master']) then
-               ssh4allowed << '$HOST_STATIC_V4'
-               ssh6allowed << '$HOST_STATIC_V6'
-       elsif scope.function_has_role(['static_source']) or
-             scope.function_has_role(['static_mirror']) then
-               ssh4allowed << '$HOST_STATICMASTER_V4'
-               ssh6allowed << '$HOST_STATICMASTER_V6'
-       end
        if scope.function_has_role(['debian_mirror']) or
           scope.function_has_role(['security_mirror']) or
           scope.function_has_role(['debug_mirror']) or