eth2 -> config.xen.network.iface
[invirt/packages/xvm-prodconfig.git] / master.yaml
index d68566d..922d131 100644 (file)
@@ -1,23 +1,15 @@
-authn:
- - type: kerberos
-   realm: ATHENA.MIT.EDU
+apt:
+ keyid: 35AE3C4F
 
 authz:
  - type: afs
    cell: athena.mit.edu
+ - type: afs
+   cell: sipb.mit.edu
 
-hosts: # hosts on which VMs run
- - hostname: citadel-station.mit.edu
-   ip: 18.181.0.221
- - hostname: aperture-science.mit.edu
-   ip: 18.181.0.222
- - hostname: shadow-moses.mit.edu
-   ip: 18.181.0.223
- - hostname: arklay-mansion.mit.edu
-   ip: 18.181.0.224
-
-apt:
- keyid: 35AE3C4F
+console:
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134
 
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
@@ -27,9 +19,14 @@ db:
  user: invirt
  dbname: invirt
 
-remote:
- hostname: xvm-remote.mit.edu
- ip: 18.181.0.188
+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
 
 dns:
  contact: xvm@mit.edu
@@ -41,14 +38,37 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
-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
+hosts: # hosts on which VMs run
+ - hostname: citadel-station.mit.edu
+   ip: 18.181.0.221
+ - hostname: aperture-science.mit.edu
+   ip: 18.181.0.222
+ - hostname: shadow-moses.mit.edu
+   ip: 18.181.0.223
+ - hostname: arklay-mansion.mit.edu
+   ip: 18.181.0.224
+
+kerberos:
+ realm: ATHENA.MIT.EDU
+
+monitoring:
+ - hostname: syn.mit.edu
+   ip: 18.181.0.65
+
+remote:
+ hostname: xvm-remote.mit.edu
+ ip: 18.181.0.188
+
+svn:
+ repopath: /afs/sipb.mit.edu/project/xvm/svn
+ uri: https://xvm.mit.edu:1111
+
+trac:
+ uri: https://xvm.scripts.mit.edu
+
+vnc:
+ base_port: 10003
+ proxy_ip: 18.181.0.62
 
 web:
  baseuri: https://xvm.mit.edu/
@@ -63,17 +83,6 @@ web:
   - quentin
   - hartmans
 
-console:
- hostname: xvm-console.mit.edu
- ip: 18.181.0.134
-
-svn:
- repopath: /afs/sipb.mit.edu/project/xvm/svn
- uri: https://xvm.mit.edu:1111
-
-trac:
- uri: https://xvm.mit.edu/trac/wiki
-
-vnc:
- base_port: 10003
- proxy_ip: 18.181.0.62
+xen:
+ network:
+  iface: eth2