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 1dfbe96..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', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya}
+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 static-master-ubc-01}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
        nodeinfo['ldap']['purpose'].each do |purp|
@@ -29,7 +29,7 @@ should_restrict = restrict_ssh.include?(@hostname)
 end
 
 
-if restrict_ssh.include?(@hostname) then
+if should_restrict then
        ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4}
        ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6}
 
@@ -44,25 +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
-               ssh4allowed << "5.153.231.5" # adayevskaya
-               ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-       end
-       if scope.function_has_role(['dns_primary']) then
-               ssh4allowed << "5.153.231.5" # adayevskaya
-               ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-               #ssh4allowed << "$HOST_DNS_GEO_V4"
-               #ssh6allowed << "$HOST_DNS_GEO_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