X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/243cf39a2f8dad4e1fb5003d41295ece24c516a0..a89c76eed3bcff329d116002e10191e7ba792962:/master.yaml?ds=sidebyside

diff --git a/master.yaml b/master.yaml
index 2d0c094..92ca816 100644
--- a/master.yaml
+++ b/master.yaml
@@ -3,20 +3,51 @@ adminacl: &adminacl system:xvm-root
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
- keyid: 35AE3C4F
+ keyid: 442461DF
 
 authz:
- - type: afs
-   cell: athena.mit.edu
-   auth: yes
- - type: afs
-   cell: sipb.mit.edu
-   auth: yes
+ 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
+
+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
 
 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
  host: xvm.mit.edu
@@ -45,25 +76,28 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
-git:
- branches:
-  prod:
-   acl: *adminacl
-   component: stable
-  dev:
-   acl: system:xvm-dev
-   component: unstable
- tagger: Invirt Build Server <invirt@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
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -101,7 +135,14 @@ web:
   - andersk
   - quentin
   - hartmans
+  - gdb
+
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
 
 xen:
- network:
-  iface: eth2
+ iface: eth2
+
+lvm:
+ vg: xenvg