Merge branch 'demo'

14 files changed, 17 insertions, 15 deletions

diff --git a/nodes/aligator.json b/nodes/aligator.json
index b5a2e5e..cae6f17 100644
--- a/nodes/aligator.json
+++ b/nodes/aligator.json
@@ -1,10 +1,11 @@
 {
   "services": "openvpn",
   "ip_address": "176.53.69.121",
-  "tags": ["production", "istanbul"],
+  "tags": ["demo", "istanbul"],
   "openvpn": {
     "gateway_address": "176.53.69.123",
     "allow_free": false,
     "filter_dns": true
-  }
+  },
+  "enabled": false
 }
diff --git a/nodes/ant.json b/nodes/ant.json
index b5d3373..14c4cbc 100644
--- a/nodes/ant.json
+++ b/nodes/ant.json
@@ -2,7 +2,7 @@
   "ip_address": "198.252.153.82",
   "services": "couchdb",
   "tags": [
-    "production",
+    "demo",
     "seattle"
   ],
   "enabled": true 
diff --git a/nodes/beetle.json b/nodes/beetle.json
index 74d4ef0..ebb98ba 100644
--- a/nodes/beetle.json
+++ b/nodes/beetle.json
@@ -1,6 +1,6 @@
 {
   "ip_address": "202.85.227.195",
-  "tags": ["production", "hongkong"],
+  "tags": ["demo", "hongkong"],
   "services": "openvpn",
   "openvpn": {
     "gateway_address": "202.85.227.196"
diff --git a/nodes/demodex.json b/nodes/demodex.json
index 79b96b1..f3dde74 100644
--- a/nodes/demodex.json
+++ b/nodes/demodex.json
@@ -1,7 +1,7 @@
 {
   "ip_address": "204.13.164.171",
   "services": ["backup"],
-  "tags": ["production", "development", "seattle"],
+  "tags": ["demo", "development", "seattle"],
   "ssh": {
     "port": 22
   }
diff --git a/nodes/dolphin.json b/nodes/dolphin.json
index 3342710..56d803d 100644
--- a/nodes/dolphin.json
+++ b/nodes/dolphin.json
@@ -4,7 +4,7 @@
 {
   "enabled": false,
   "ip_address": "223.223.175.10",
-  "tags": ["production", "phnompenh"],
+  "tags": ["demo", "phnompenh"],
   "services": "openvpn",
   "openvpn": {
     "gateway_address": "223.223.175.15"
diff --git a/nodes/hippo.json b/nodes/hippo.json
index 07865f0..0264908 100644
--- a/nodes/hippo.json
+++ b/nodes/hippo.json
@@ -2,7 +2,7 @@
 {
   "ip_address": "85.17.92.143",
   "services": ["openvpn", "tor"],
-  "tags": ["production", "amsterdam"],
+  "tags": ["demo", "amsterdam"],
   "openvpn": {
     "gateway_address": "85.17.92.167"
   },
diff --git a/nodes/leech.json b/nodes/leech.json
index 316257c..a582a5a 100644
--- a/nodes/leech.json
+++ b/nodes/leech.json
@@ -2,7 +2,7 @@
   "ip_address": "198.252.153.85",
   "services": "mx",
   "tags": [
-    "production",
+    "demo",
     "seattle"
   ]
 }
diff --git a/nodes/millipede.json b/nodes/millipede.json
index 609be10..33b3487 100644
--- a/nodes/millipede.json
+++ b/nodes/millipede.json
@@ -5,7 +5,7 @@
   },
   "services": ["openvpn"],
   "tags": [
-    "production",
+    "demo",
     "seattle"
   ]
 }
diff --git a/nodes/sloth.json b/nodes/sloth.json
index fc9cb88..946280d 100644
--- a/nodes/sloth.json
+++ b/nodes/sloth.json
@@ -4,5 +4,6 @@
   "ssh": {
     "port": 4422
   },
-  "tags": ["production", "istanbul"]
+  "tags": ["demo", "istanbul"],
+  "enabled": false
 }
diff --git a/nodes/snake.json b/nodes/snake.json
index f8e715d..5c52b2e 100644
--- a/nodes/snake.json
+++ b/nodes/snake.json
@@ -4,7 +4,7 @@
     "couchdb",
     "soledad"
   ],
-  "tags": ["production", "dc"],
+  "tags": ["demo", "dc"],
   // currently down in DC, 2013-06-27
   "enabled": false
 }
diff --git a/nodes/thrips.json b/nodes/thrips.json
index 23b7a85..8f0ad56 100644
--- a/nodes/thrips.json
+++ b/nodes/thrips.json
@@ -4,7 +4,7 @@
     "couchdb",
     "soledad"
   ],
-  "tags": ["production", "seattle"], 
+  "tags": ["demo", "seattle"], 
   "couch": {
     "backup": true 
   }
diff --git a/nodes/wallaby.json b/nodes/wallaby.json
index 3e69d88..82856a1 100644
--- a/nodes/wallaby.json
+++ b/nodes/wallaby.json
@@ -1,6 +1,6 @@
 {
   "ip_address": "204.13.164.57",
-  "tags": ["production", "seattle"],
+  "tags": ["demo", "seattle"],
   "services": "webapp",
   "webapp": {
     "secure": true
diff --git a/nodes/wombat.json b/nodes/wombat.json
index a5af6a7..1fbaa78 100644
--- a/nodes/wombat.json
+++ b/nodes/wombat.json
@@ -1,6 +1,6 @@
 {
   "ip_address": "199.119.112.20",
-  "tags": ["production", "dc"],
+  "tags": ["demo", "dc"],
   "services": [
     "webapp"
   ],
diff --git a/nodes/zebra.json b/nodes/zebra.json
index eecb5b1..3873f3d 100644
--- a/nodes/zebra.json
+++ b/nodes/zebra.json
@@ -1,7 +1,7 @@
 {
   "ip_address": "199.119.112.21",
   "services": "mx",
-  "tags": ["production", "dc"],
+  "tags": ["demo", "dc"],
   // currently down in DC, 2013-06-27
   "enabled": false
 }