X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-devconfig.git/blobdiff_plain/6aa355c751d39e9eb094403ec347806cf4c09224..ac7f6546910220934e66bcbf89d08db7ebf6b76f:/master.yaml

diff --git a/master.yaml b/master.yaml
index a3f7145..94d5b9a 100644
--- a/master.yaml
+++ b/master.yaml
@@ -4,8 +4,11 @@ adminacl: system:xvm-dev
 kerberos:
  realm: ATHENA.MIT.EDU
 
+apt:
+ keyid: 5E0DB194
+
 authz:
- mech: xvm.authz.locker
+ name: xvm-locker
  afs:
   cells:
   - cell: athena.mit.edu
@@ -24,7 +27,7 @@ authz:
 build:
  pockets:
   prod:
-   acl: *adminacl
+   acl: system:xvm-root
    apt: stable
   dev:
    acl: system:xvm-dev
@@ -34,10 +37,18 @@ build:
   name: Invirt Build Server
   email: invirt@mit.edu
 
+cluster:
+ rings:
+  - bind: 10.7.0.0
+    mcast: 239.255.252.2
+    port: 5405
+
 hosts: # hosts on which VMs run
  - hostname: black-mesa.mit.edu
    ip: 18.181.0.60
+   internal_ip: black-mesa-internal
  - hostname: torchwood-institute.mit.edu
+   internal_ip: torchwood-institute-internal
    ip: 18.181.0.165
 
 db:
@@ -78,11 +89,15 @@ dhcp:
 mail:
  forward: xvm-dev-auto@mit.edu
 
+network:
+ gateway: 18.181.0.1
+ netmask: 255.255.0.0
+
+lvm:
+ vg: xenvg
+
 xen:
- network:
-  gateway: 18.181.0.1
-  netmask: 255.255.0.0
-  iface: eth0
+ iface: eth0
 
 web:
  baseuri: https://xvm-dev.mit.edu/
@@ -97,3 +112,7 @@ vnc:
 
 trac:
  uri: https://xvm.scripts.mit.edu
+
+monitoring:
+ - hostname: sipb-noc.mit.edu
+   ip: 18.181.0.65