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(-) (limited to 'provider/nodes') 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 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(-) (limited to 'provider/nodes') 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(-) (limited to 'provider/nodes') 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