X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/1d51350dab4d099bc2aa2514a88bd9c4c85340a2..a89c76eed3bcff329d116002e10191e7ba792962:/master.yaml

diff --git a/master.yaml b/master.yaml
index 8347292..92ca816 100644
--- a/master.yaml
+++ b/master.yaml
@@ -1,23 +1,52 @@
-authn:
- - type: kerberos
-   realm: ATHENA.MIT.EDU
+contact: &contact xvm@mit.edu
+adminacl: &adminacl system:xvm-root
+priv_contact: &priv_contact xvm-root@mit.edu
+
+apt:
+ keyid: 442461DF
 
 authz:
- - type: afs
-   cell: athena.mit.edu
+ name: xvm-locker
+ afs:
+  cells:
+  - cell: athena.mit.edu
+    auth: yes
+  - cell: sipb.mit.edu
+    auth: yes
+  - cell: zone.mit.edu
+    auth: yes
+  - cell: ops.mit.edu
+    auth: no
+  - cell: net.mit.edu
+    auth: no
+  - cell: dev.mit.edu
+    auth: no
 
-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
+build:
+ pockets:
+  prod:
+   acl: *adminacl
+   apt: stable
+  dev:
+   acl: system:xvm-dev
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu
 
-apt:
- keyid: 35AE3C4F
+console:
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134
+
+cluster:
+ rings:
+  - bind: 10.5.128.0
+    mcast: 239.255.252.0
+    port: 5405
+  - bind: 10.6.128.0
+    mcast: 239.255.252.1
+    port: 5405
 
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
@@ -27,45 +56,62 @@ 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
+ contact: *contact
  domains: # first one is advertised
   - xvm.mit.edu
+  - 2.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm.mit.edu
     ip: 18.181.0.62
  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
+   internal_ip: citadel-station-internal
+   ip: 18.181.0.221
+ - hostname: aperture-science.mit.edu
+   internal_ip: aperture-science-internal
+   ip: 18.181.0.222
+ - hostname: shadow-moses.mit.edu
+   internal_ip: shadow-moses-internal
+   ip: 18.181.0.223
+ - hostname: arklay-mansion.mit.edu
+   internal_ip: arklay-mansion-internal
+   ip: 18.181.0.224
+ - hostname: discovery-one.mit.edu
+   internal_ip: discovery-one-internal
+   ip: 18.181.0.225
+ - hostname: global-dynamics.mit.edu
+   internal_ip: global-dynamics-internal
+   ip: 18.181.0.99
+ - hostname: babylon-four.mit.edu
+   internal_ip: babylon-four-internal
+   ip: 18.181.0.100
 
-web:
- baseuri: https://xvm.mit.edu/
- hostname: xvm.mit.edu
- errormail: xvm@mit.edu
- adminacl: system:xvm-root
- errormail_exclude:
-  - broder
-  - price
-  - ecprice
-  - andersk
-  - quentin
-  - hartmans
+kerberos:
+ realm: ATHENA.MIT.EDU
 
-console:
- hostname: xvm-console.mit.edu
- ip: 18.181.0.134
+mail:
+ forward: *priv_contact
+
+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
@@ -78,6 +124,25 @@ vnc:
  base_port: 10003
  proxy_ip: 18.181.0.62
 
-monitoring:
- - hostname: syn.mit.edu
-   ip: 18.181.0.65
+web:
+ baseuri: https://xvm.mit.edu/
+ hostname: xvm.mit.edu
+ errormail: *contact
+ errormail_exclude:
+  - broder
+  - price
+  - ecprice
+  - andersk
+  - quentin
+  - hartmans
+  - gdb
+
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
+
+xen:
+ iface: eth2
+
+lvm:
+ vg: xenvg