summaryrefslogtreecommitdiff
path: root/provider/nodes
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-17 01:26:48 -0800
committerelijah <elijah@riseup.net>2012-11-17 01:26:48 -0800
commit7ae726542704478e8f1287db04b2a808ade37674 (patch)
tree448455bb4902b075d8ddacb4871999dd7fb750d8 /provider/nodes
parent5a5e41d2b86edf92e16512581892a248473c886c (diff)
parent6ac343659883317b5284ebe1e364b38793d50f29 (diff)
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'provider/nodes')
-rw-r--r--provider/nodes/couchdb1_vagrant.json3
-rw-r--r--provider/nodes/vpn1_vagrant.json4
-rw-r--r--provider/nodes/web1_vagrant.json1
3 files changed, 3 insertions, 5 deletions
diff --git a/provider/nodes/couchdb1_vagrant.json b/provider/nodes/couchdb1_vagrant.json
index 87f4935..390767d 100644
--- a/provider/nodes/couchdb1_vagrant.json
+++ b/provider/nodes/couchdb1_vagrant.json
@@ -1,6 +1,5 @@
{
"services": "couchdb",
"ip_address": "10.5.5.44",
- "ssh": {
- "port": 4422 }
+ "tags": ["vagrant"]
}
diff --git a/provider/nodes/vpn1_vagrant.json b/provider/nodes/vpn1_vagrant.json
index 888b55c..33cccd0 100644
--- a/provider/nodes/vpn1_vagrant.json
+++ b/provider/nodes/vpn1_vagrant.json
@@ -1,10 +1,8 @@
{
"services": "openvpn",
+ "tags": ["vagrant"],
"ip_address": "10.5.5.45",
"interface": "eth0",
- "ssh": {
- "port": 4422 },
- "tags": "production",
"openvpn": {
"gateway_address": "10.5.5.46",
"filter_dns": true
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"
}