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 static-master-ubc-01}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-ubc-01 geo1 geo2 geo3 denis}
if (nodeinfo['ldap'].has_key?('purpose')) then
nodeinfo['ldap']['purpose'].each do |purp|
ssh6allowed = []
should_restrict = restrict_ssh.include?(@hostname)
-%w{dns_primary dns_geo}.each do |role_restrict|
- if scope.function_has_role([role_restrict]) then
- should_restrict = true
- end
-end
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}
+ # draghi makes for a nice jumphost
+ ssh4allowed << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_MUNIN_V4 82.195.75.106}
+ ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 2001:41b8:202:deb:1a1a:0:52c3:4b6a}
if %w{draghi}.include?(@hostname) then
ssh4allowed << '$HOST_DEBIAN_V4'
if scope.function_has_role(['debian_mirror']) or
scope.function_has_role(['security_mirror']) or
+ scope.function_has_role(['ports_mirror']) or
scope.function_has_role(['debug_mirror']) or
scope.function_has_role(['historical_mirror']) or
scope.function_has_role(['syncproxy']) then