From d123344be67c83eb90e689f28794e404bbeb1d86 Mon Sep 17 00:00:00 2001
From: Zachary Seguin <ztseguin@csclub.uwaterloo.ca>
Date: Tue, 8 Aug 2017 16:44:42 -0400
Subject: [PATCH] Update hosts

---
 hosts | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/hosts b/hosts
index 93d199f..f3e1ce8 100644
--- a/hosts
+++ b/hosts
@@ -22,7 +22,6 @@ taurine.csclub.uwaterloo.ca
 
 [general-use-containers]
 caffeine.csclub.uwaterloo.ca
-testnode2.csclub.uwaterloo.ca
 
 [general-use-containers:children]
 webnodes
@@ -41,6 +40,7 @@ strombola.csclub.uwaterloo.ca
 [syscom:children]
 syscom-bare-metal
 syscom-containers
+cloud
 
 [syscom-bare-metal]
 aspartame.csclub.uwaterloo.ca
@@ -51,22 +51,20 @@ potassium-benzoate.csclub.uwaterloo.ca
 sodium-benzoate.csclub.uwaterloo.ca
 yerba-mate.csclub.uwaterloo.ca
 guayusa.csclub.uwaterloo.ca
-ginkgo.csclub.uwaterloo.ca
-sandstorm.csclub.uwaterloo.ca
 coffee.csclub.uwaterloo.ca
-os-controller.csclub.uwaterloo.ca
-os-block1.csclub.uwaterloo.ca
-os-object1.csclub.uwaterloo.ca
-os-compute1.csclub.uwaterloo.ca
+
+[cloud]
 db1.cloud.csclub.uwaterloo.ca
 controller1.cloud.csclub.uwaterloo.ca
 compute1.cloud.csclub.uwaterloo.ca
+compute2.cloud.csclub.uwaterloo.ca
 network1.cloud.csclub.uwaterloo.ca
 block1.cloud.csclub.uwaterloo.ca
 object1.cloud.csclub.uwaterloo.ca
 web1.cloud.csclub.uwaterloo.ca
 router1.cloud.csclub.uwaterloo.ca
-identity.csclub.uwaterloo.ca
+dns1.cloud.csclub.uwaterloo.ca
+ginkgo.csclub.uwaterloo.ca
 
 [syscom-containers]
 auth1.csclub.uwaterloo.ca
@@ -80,6 +78,13 @@ dns1.csclub.uwaterloo.ca
 dns2.csclub.uwaterloo.ca
 cifs.csclub.uwaterloo.ca
 mattermost.csclub.uwaterloo.ca
+shibboleth.csclub.uwaterloo.ca
+semaphore.csclub.uwaterloo.ca
+test-ipv6.csclub.uwaterloo.ca
+etcd-mc.csclub.uwaterloo.ca
+etcd-dc.csclub.uwaterloo.ca
+etcd-phy.csclub.uwaterloo.ca
+prometheus.csclub.uwaterloo.ca
 
 [syscom-containers:children]
 load-balancers
@@ -91,5 +96,15 @@ nullsleep.csclub.uwaterloo.ca
 potassium-benzoate.csclub.uwaterloo.ca
 
 [load-balancers]
-load-balancer-01.csclub.uwaterloo.ca lb_priority=150
+load-balancer-01.csclub.uwaterloo.ca lb_priority=110
 load-balancer-02.csclub.uwaterloo.ca lb_priority=100
+
+[cloud-csc-club-managed:children]
+club-iie
+club-uwarc
+
+[club-iie]
+wiki.iie.csclub.cloud
+
+[club-uwarc]
+wiki.uwarc.csclub.cloud