Add os-compute1
[public/hosts.git] / hosts.in
index 256da54..b542ef8 100644 (file)
--- a/hosts.in
+++ b/hosts.in
@@ -9,12 +9,8 @@
 !ff02::3     ip6-allhosts
 
 # Math Student Orgs Net
-mathstudentorgs.net.uwaterloo.ca
-
-mc-cs1-mathstudentorgsnet.uwaterloo.ca
-mc-cs2-mathstudentorgsnet.uwaterloo.ca
-
-mc-cs-cvl.net.uwaterloo.ca
+mathstudentorgs-net.nsx.uwaterloo.ca
+mc-cs2.nsx.uwaterloo.ca
 
 # CSC - General Use
 
@@ -42,25 +38,38 @@ officeterm-vm-test
 # CSC - Syscom
 
 auth1
-!129.97.18.19 auth2.csclub.uwaterloo.ca auth2
+auth2
 ldap1
-!129.97.18.19 ldap2.csclub.uwaterloo.ca ldap2
+ldap2
 kdc1
-!129.97.18.19 kdc2.csclub.uwaterloo.ca kdc2
+kdc2
 kadmin
 
 hydrazine
 electrons
+logstash
+sandstorm
 
 mail
 
 aspartame
-!129.97.18.18 cobalamin.csclub.uwaterloo.ca cobalamin
+cobalamin
 dextrose
 glomag
 psilodump
 sodium-benzoate
 potassium-benzoate
+ginkgo
+coffee
+os-controller
+os-compute1
+
+# CSC - FS
+fs00
+
+# CSC - TBD
+yerba-mate
+guayusa
 
 # CSC - Web
 
@@ -73,6 +82,12 @@ mailman
 munin
 mirror
 debian
+netbox
+
+# CSC - Web improvement project
+load-balancer
+caffeine-00
+caffeine-01
 
 # CSC - Testnodes
 testnode1
@@ -83,8 +98,7 @@ testnode5
 
 # CSC - IPMI/LOM
 
-mso-private.net.uwaterloo.ca
-mc-cs1-mso-private.uwaterloo.ca
+mso-private-net.ns.uwaterloo.ca
 mc-cs2-mso-private.uwaterloo.ca
 
 kvm
@@ -92,14 +106,15 @@ taurine-ilo
 sodium-benzoate-ipmi
 glomag-ipmi
 corn-syrup-ipmi
-#sucrose-ilo
-#dextrose-ilo
-!10.15.134.113    sucrose-ilo.csclub.uwaterloo.ca  sucrose-ilo
-!10.15.134.114    dextrose-ilo.csclub.uwaterloo.ca dextrose-ilo
+sucrose-ilo
+dextrose-ilo
 cobalamin-ipmi
-!10.15.134.155    high-fructose-corn-syrup-impi.csclub.uwaterloo.ca high-fructose-corn-syrup-impi
-!10.15.134.155    hfcs-ipmi.csclub.uwaterloo.ca hfcs-ipmi
+high-fructose-corn-syrup-ipmi
+hfcs-ipmi
 potassium-benzoate-ipmi
+yerba-mate-ipmi
+guayusa-ipmi
+ginkgo-ipmi
 
 # CSC - Private
 
@@ -109,9 +124,6 @@ taurine-private
 corn-syrup-private
 potassium-benzoate-private
 
-# TEMPORARY: Until contents of old-mirror are copied to new-mirror
-!10.15.134.206  sodium-benzoate-private.csclub.uwaterloo.ca sodium-benzoate-private
-
 # CSC - Coder
 coder01
 coder02