From 27811205721221c5798d70fe0d28cde463cab3b5 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 15 Nov 2012 15:51:26 -0500 Subject: remove the ssh alt port 4422 for vagrant nodes --- provider/nodes/couchdb1_vagrant.json | 4 +--- provider/nodes/vpn1_vagrant.json | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/provider/nodes/couchdb1_vagrant.json b/provider/nodes/couchdb1_vagrant.json index 87f4935..4b1dde1 100644 --- a/provider/nodes/couchdb1_vagrant.json +++ b/provider/nodes/couchdb1_vagrant.json @@ -1,6 +1,4 @@ { "services": "couchdb", - "ip_address": "10.5.5.44", - "ssh": { - "port": 4422 } + "ip_address": "10.5.5.44" } diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1_vagrant.json index 888b55c..54c0c97 100644 --- a/provider/nodes/vpn1_vagrant.json +++ b/provider/nodes/vpn1_vagrant.json @@ -2,8 +2,6 @@ "services": "openvpn", "ip_address": "10.5.5.45", "interface": "eth0", - "ssh": { - "port": 4422 }, "tags": "production", "openvpn": { "gateway_address": "10.5.5.46", -- cgit v1.2.3 From 7e0be44e8e94e9551906c7cc6a843ce48cb4ea35 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 15 Nov 2012 17:04:08 -0500 Subject: add vagrant node ssh public keys and updates to known_hosts file --- provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub | 1 + provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub | 1 + provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub | 1 + provider/files/ssh/known_hosts | 3 +++ 4 files changed, 6 insertions(+) create mode 100644 provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub create mode 100644 provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub create mode 100644 provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub new file mode 100644 index 0000000..76deebc --- /dev/null +++ b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD \ No newline at end of file diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub new file mode 100644 index 0000000..76deebc --- /dev/null +++ b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD \ No newline at end of file diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub new file mode 100644 index 0000000..76deebc --- /dev/null +++ b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD \ No newline at end of file diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts index 3ef8e56..2230bde 100644 --- a/provider/files/ssh/known_hosts +++ b/provider/files/ssh/known_hosts @@ -1,4 +1,7 @@ ca1,ca1.bitmask.i,ca1.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX couch1,couch1.bitmask.i,couch1.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B +couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD vpn1,vpn1.bitmask.i,vpn1.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv +vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD web1,web1.bitmask.i,web1.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsxN2K/I/pVbcU4nNsep9BsUzebFpldzntm6KBx+6OGgLEJnK0WObk0mqP29W2HveisF61hgpI+j7BX38VTiRIcPJEK1BoPONcrVX/bWARn+88PhFfoMJLa5rON5IFAahRUOkS4CnrAwsuvOZ4CzneW1P7cYitKrRNUXzKMHRcAd5alOyrSKLJ29JmIt7ojmYTnNYQYsvyqexI6pyfg4kIYFHzt0BIzNWMJb76PrTpteY4ZW35VHdB8AGLSI7iWxMtEyekhlvHJ2EoHfvps+BVTto7xxVFLDpjIdzxClGcQNvWB14NdYQ0ikRflYRMO6nvTGC31jij43oMp2cACUwD +web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiROaZVwf91t5HrqN02so4zN3Te2boJ3dyuGxoNa2oPosmEEyAcsOKH5a4WqSX6zMYUVL+lA6Be4boZgAt8XC0YkbHaTKJiTqJ80AGb5h8YEhaPmvnGdHPjOBeeOgIlgmmvnUeeTv+DkGzJ5iXVTxkaEFOvZP7fI2M49MDSyuPO1gMj48WymCgWfCACnA6W1k+BDpIFSdpy3vLXjJnGYRFPV4ANgjbxd9utA6dWILZfpe74E+BfyYZU69sjLp5xJX5qVFwrnnn8A86V45QYIqLMCbQibsYkxL2WApp3vk8JvJ/zepLRn40PCG8oQYu2a2/aUpSRXo6114H6wEg38HD -- cgit v1.2.3 From ead0733833c32240b4e0ee7729737beedd662fb0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 15 Nov 2012 17:04:56 -0500 Subject: add vagrant tag --- provider/tags/vagrant.json | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 provider/tags/vagrant.json diff --git a/provider/tags/vagrant.json b/provider/tags/vagrant.json new file mode 100644 index 0000000..2c63c08 --- /dev/null +++ b/provider/tags/vagrant.json @@ -0,0 +1,2 @@ +{ +} -- cgit v1.2.3 From 16b1f266cdbf2f07bff6ff26c13be71e6da9b150 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 15 Nov 2012 17:05:42 -0500 Subject: Revert "remove unknown vagrant tags from nodes" - now that tags/vagrant.json exists, these tags should work This reverts commit e307b25672f534fbd057483c1af11060bb40d530. Conflicts: provider/nodes/couchdb1_vagrant.json --- provider/nodes/couchdb1_vagrant.json | 3 ++- provider/nodes/vpn1_vagrant.json | 1 + provider/nodes/web1_vagrant.json | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/provider/nodes/couchdb1_vagrant.json b/provider/nodes/couchdb1_vagrant.json index 4b1dde1..390767d 100644 --- a/provider/nodes/couchdb1_vagrant.json +++ b/provider/nodes/couchdb1_vagrant.json @@ -1,4 +1,5 @@ { "services": "couchdb", - "ip_address": "10.5.5.44" + "ip_address": "10.5.5.44", + "tags": ["vagrant"] } diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1_vagrant.json index 54c0c97..5851302 100644 --- a/provider/nodes/vpn1_vagrant.json +++ b/provider/nodes/vpn1_vagrant.json @@ -1,5 +1,6 @@ { "services": "openvpn", + "tags": ["vagrant"], "ip_address": "10.5.5.45", "interface": "eth0", "tags": "production", diff --git a/provider/nodes/web1_vagrant.json b/provider/nodes/web1_vagrant.json index 689ce62..4e80ba9 100644 --- a/provider/nodes/web1_vagrant.json +++ b/provider/nodes/web1_vagrant.json @@ -1,4 +1,5 @@ { "services": "webapp", + "tags": ["vagrant"], "ip_address": "10.5.5.47" } -- cgit v1.2.3 From 6ac343659883317b5284ebe1e364b38793d50f29 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 15 Nov 2012 17:07:30 -0500 Subject: remove extraneous tag from vpn1_vagrant node --- provider/nodes/vpn1_vagrant.json | 1 - 1 file changed, 1 deletion(-) diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1_vagrant.json index 5851302..33cccd0 100644 --- a/provider/nodes/vpn1_vagrant.json +++ b/provider/nodes/vpn1_vagrant.json @@ -3,7 +3,6 @@ "tags": ["vagrant"], "ip_address": "10.5.5.45", "interface": "eth0", - "tags": "production", "openvpn": { "gateway_address": "10.5.5.46", "filter_dns": true -- cgit v1.2.3