Cleaned up the Dojo Labs SSH config, added new services VPC.

.ssh/config.d/20_bullguard → .ssh/config.d/20_dojolabs

-# Bullguard
+# Dojo Labs
 
 Host gitlab.dc.dojo-labs.com
 HostName gitlab.dc.dojo-labs.com
 User nimrod
-IdentityFile ~/.ssh/bullguard_ecdsa
+IdentityFile ~/.ssh/dojo_ecdsa
 
 Host ran-int-teamcity.dc.dojo-labs.com
 HostName ran-int-teamcity.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-ofer_rsa
+IdentityFile ~/.ssh/dojo_ofer_rsa
 
 Host ran-dev-autobuild.dc.dojo-labs.com
 HostName ran-dev-autobuild.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard_ecdsa
+IdentityFile ~/.ssh/dojo_ecdsa
 
 Host devtools.dc.dojo-labs.com
 HostName devtools.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard_ecdsa
+IdentityFile ~/.ssh/dojo_ecdsa
 
 Host playground.dc.dojo-labs.com
 HostName playground.dc.dojo-labs.com
 User nimrod
-IdentityFile ~/.ssh/bullguard_ecdsa
+IdentityFile ~/.ssh/dojo_ecdsa
 
 Host ran-stg-build.dc.dojo-labs.com
 HostName ran-stg-build.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard_ecdsa
+IdentityFile ~/.ssh/dojo_ecdsa
 
 Host demo-csp.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-prod_rsa
+IdentityFile ~/.ssh/dojo_prod_rsa
 
 Host dev-csp.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 
 Host qa-csp.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-qa_rsa
+IdentityFile ~/.ssh/dojo_qa_rsa
 
 Host int-csp.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-integration_rsa
+IdentityFile ~/.ssh/dojo_int_rsa
 
 Host stg-csp.dc.dojo-labs.com
 User ubuntu
-IdentityFile ~/.ssh/bullguard-staging_rsa
+IdentityFile ~/.ssh/dojo_stg_rsa
 
 Host 172.23.44.125
-IdentityFile ~/.ssh/bullguard-ofer_rsa
+IdentityFile ~/.ssh/dojo_ofer_rsa
 
 Host 172.23.87.109
-IdentityFile ~/.ssh/bullguard-ofer_rsa
+IdentityFile ~/.ssh/dojo_ofer_rsa
 
 Host 172.23.93.156
 User ec2-user
 
 Host 172.16.*.*
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
-Host 172.17.*.*
-IdentityFile ~/.ssh/bullguard-qa_rsa
-User ubuntu
-ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
-
-Host 172.20.*.*
-IdentityFile ~/.ssh/bullguard-staging_rsa
+Host 172.18.*.*
+IdentityFile ~/.ssh/dojo_svc_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 172.21.*.*
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 172.22.*.*
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 172.23.*.*
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 172.24.*.*
-IdentityFile ~/.ssh/bullguard-staging_rsa
-User ubuntu
-ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
-
-Host 172.25.*.*
-IdentityFile ~/.ssh/bullguard-prod_rsa
-User ubuntu
-ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
-
-Host 172.26.*.*
-IdentityFile ~/.ssh/bullguard-integration_rsa
+IdentityFile ~/.ssh/dojo_stg_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 172.50.*.*
-IdentityFile ~/.ssh/bullguard-prod_rsa
+IdentityFile ~/.ssh/dojo_prod_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host 10.10.*.*
-IdentityFile ~/.ssh/bullguard-dev-new_rsa
+IdentityFile ~/.ssh/dojo_dev_new_rsa
 User ubuntu
 ProxyCommand ssh ran-dev-autobuild.dc.dojo-labs.com -W %h:%p
 
 Host dev-csp-scanner.dojo-labs.com
 HostName 51.15.113.179
 User root
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 
 Host dev-scanner.dojo-labs.com
 HostName 51.15.123.142
 User root
-IdentityFile ~/.ssh/bullguard-dev_rsa
+IdentityFile ~/.ssh/dojo_dev_rsa
 
 Host prod-scanner.dojo-labs.com
 HostName 51.15.125.178
 User root
-IdentityFile ~/.ssh/bullguard-prod_rsa
+IdentityFile ~/.ssh/dojo_prod_rsa
 
 Host qadesktop.dojo-labs.com
 HostName 192.168.0.164
 User qadesktop
-IdentityFile ~/.ssh/bullguard_ecdsa
-
-Host bastion.ops.dojo-labs.com
-User admin
-IdentityFile ~/.ssh/bullguard-dev_rsa
-ForwardAgent yes
+IdentityFile ~/.ssh/dojo_ecdsa