Merge pull request #158 from CodeNow/remove-old-docks

remove old style docks

Author: bkendall

ansible/beta-hosts/docks.js

@@ -55,21 +55,6 @@ ec2.describeInstances(params, function (err, data) {
     }
   });
 
-  // Add Static docks
-  // TODO Eventually we should no longer need these
-  hosts.push('beta-runnable-build');
-  hosts.push('beta-runnable-run');
-  hosts.push('beta-dock1');
-  hostVars['beta-runnable-build'] = {
-    host_tags: '2335750,build,run'
-  };
-  hostVars['beta-runnable-run'] = {
-    host_tags: '2335750,build,run'
-  };
-  hostVars['beta-dock1'] = {
-    host_tags: 'default'
-  };
-
   // Output the resulting JSON
   // NOTE http://docs.ansible.com/ansible/developing_inventory.html
   console.log(JSON.stringify(

ansible/prod-hosts/docks.js

@@ -6,7 +6,7 @@ var aws = require('aws-sdk');
 var ec2 = new aws.EC2({
   accessKeyId: 'AKIAJ3RCYU6FCULAJP2Q',
   secretAccessKey: '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',
-  region: 'us-west-2'
+  region: 'us-west-1'
 });
 
 var params = {
@@ -55,39 +55,6 @@ ec2.describeInstances(params, function (err, data) {
     }
   });
 
-  // Add Static docks
-  // TODO Eventually we should no longer need these
-  hosts.push('alpha-dock2');
-  hosts.push('alpha-dock3');
-  hosts.push('alpha-dock4');
-  hosts.push('alpha-dock5');
-  hosts.push('alpha-demo');
-  hosts.push('alpha-runnable2');
-  hosts.push('alpha-intercom1');
-  hosts.push('alpha-intercom2');
-
-  hostVars['alpha-dock3'] = {
-    host_tags: 'default'
-  };
-  hostVars['alpha-dock4'] = {
-    host_tags: 'default'
-  };
-  hostVars['alpha-dock5'] = {
-    host_tags: 'default'
-  };
-  hostVars['alpha-demo'] = {
-    host_tags: '1085792,1617343,run,build'
-  };
-  hostVars['alpha-runnable2'] = {
-    host_tags: '2335750,build,run'
-  };
-  hostVars['alpha-intercom1'] = {
-    host_tags: '6585,build,run'
-  };
-  hostVars['alpha-intercom2'] = {
-    host_tags: '6585,build,run'
-  };
-
   // Output the resulting JSON
   // NOTE http://docs.ansible.com/ansible/developing_inventory.html
   console.log(JSON.stringify(

ssh/config

@@ -10,11 +10,6 @@ Host beta*
   StrictHostKeyChecking no
   IdentityFile ~/.ssh/oregon.pem
 
-Host mesos*
-  User core
-  ForwardAgent yes
-  IdentityFile ~/.ssh/oregon.pem
-
 ################################################################################
 # production runnable.io
 ################################################################################
@@ -71,35 +66,6 @@ Host alpha-redis-slave
 Host alpha-redis
   ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.172 22
 
-## do not change below line, it is referenced in ansible scripts
-# prod-hosts docks
-Host alpha-demo
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.92 22
-
-Host alpha-dock1
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.41 22
-
-Host alpha-dock2
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.10 22
-
-Host alpha-dock3
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.210 22
-
-Host alpha-dock4
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.4 22
-
-Host alpha-dock5
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.206 22
-
-Host alpha-runnable2
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.93 22
-
-Host alpha-intercom1
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.79 22
-
-Host alpha-intercom2
-  ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.117 22
-
 Host alpha-rabbit
   ProxyCommand ssh -q ubuntu@alpha-bastion nc 10.0.1.253 22
 
@@ -142,12 +108,6 @@ Host migration-router
   ForwardAgent yes
   IdentityFile ~/.ssh/oregon.pem
 
-Host elk
-  ProxyCommand ssh -q ubuntu@oregon-bastion nc 10.2.1.222 22
-  User ubuntu
-  ForwardAgent yes
-  IdentityFile ~/.ssh/oregon.pem
-
 Host hubot
   ProxyCommand ssh -q ubuntu@oregon-bastion nc 10.2.0.230 22
   User ubuntu
@@ -206,33 +166,6 @@ Host beta-rabbit
 Host beta-web
   ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.61 22
 
-## do not change below line, it is referenced in ansible scripts
-# beta-hosts docks
-Host beta-runnable-build
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.209 22
-Host beta-runnable-run
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.26 22
-Host beta-dock1
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.20.1.201 22
-
-## beta mesos
-Host mesos-master
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.4.196 22
-Host mesos-private-slave1
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.3.159 22
-Host mesos-private-slave2
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.3.157 22
-Host mesos-private-slave3
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.3.158 22
-Host mesos-private-slave4
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.3.160 22
-Host mesos-private-slave5
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.3.156 22
-Host mesos-public-slave1
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.4.178 22
-Host mesos-admin
-  ProxyCommand ssh -q ubuntu@beta-bastion nc 10.0.5.195 22
-
 ################################################################################
 # other
 ################################################################################
@@ -241,7 +174,3 @@ Host 127.0.0.1
   UserKnownHostsFile /dev/null
   User core
   LogLevel QUIET
-
-Host devbox-3
-  User ubuntu
-  HostName 54.177.1.44