X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-devconfig.git/blobdiff_plain/333092823e9d3c9d49be4ba87eb72a805a4e6a9c..9ef4de031c628aa1894e9c6aa7b92af63de015ba:/master.yaml

diff --git a/master.yaml b/master.yaml
index 7213bc4..d5ea459 100644
--- a/master.yaml
+++ b/master.yaml
@@ -8,6 +8,8 @@ authz:
 hosts: # hosts on which VMs run
  - hostname: black-mesa.mit.edu
    ip: 18.181.0.60
+ - hostname: torchwood-institute.mit.edu
+   ip: 18.181.0.165
 
 db:
  uri: postgres://invirt@xvm-dev.mit.edu/invirt
@@ -32,14 +34,21 @@ dns:
  nameservers:
   - hostname: xvm-dev.mit.edu
     ip: 18.181.0.80
- rootip: 18.181.0.80
- passup:
-  - _vlmcs._tcp
- parent: mit.edu
 
-network:
+dhcp:
  gateway: 18.181.0.1
  netmask: 255.255.0.0
+ dns:
+  - 18.70.0.160
+  - 18.71.0.151
+  - 18.72.0.3
+ search_domain: mit.edu
+
+xen:
+ network:
+  gateway: 18.181.0.1
+  netmask: 255.255.0.0
+  iface: eth0
 
 web:
  baseuri: https://xvm-dev.mit.edu/
@@ -51,5 +60,9 @@ web:
   - ecprice
   - andersk
 
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.80
+
 trac:
  uri: https://xvm.scripts.mit.edu