Add "cluster" blocks to {dev,prod}config for configuration openais.

[invirt/packages/xvm-devconfig.git] / master.yaml

diff --git a/master.yaml b/master.yaml
index c3879a3..b89e3af 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,13 +1,46 @@
+contact: &contact xvm-dev@mit.edu
+adminacl: system:xvm-dev
+
 kerberos:
  realm: ATHENA.MIT.EDU
 
+apt:
+ keyid: 5E0DB194
+
 authz:
- - type: afs
-   cell: athena.mit.edu
-   auth: no
- - type: afs
-   cell: sipb.mit.edu
-   auth: no
+ afs:
+  cells:
+  - cell: athena.mit.edu
+    auth: no
+  - cell: sipb.mit.edu
+    auth: yes
+  - cell: zone.mit.edu
+    auth: no
+  - cell: ops.mit.edu
+    auth: no
+  - cell: net.mit.edu
+    auth: no
+  - cell: dev.mit.edu
+    auth: no
+
+build:
+ pockets:
+  prod:
+   acl: system:xvm-root
+   apt: stable
+  dev:
+   acl: system:xvm-dev
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  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
@@ -32,9 +65,11 @@ remote:
  ip: 18.181.0.231
 
 dns:
- contact: xvm@mit.edu
+ contact: *contact
  domains:  # first one is advertised
   - dev.xvm.mit.edu
+  - 2.181.18.in-addr.arpa
+  - 1.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm-dev.mit.edu
     ip: 18.181.0.80
@@ -48,21 +83,25 @@ dhcp:
   - 18.72.0.3
  search_domain: mit.edu
 
+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/
  hostname: xvm-dev.mit.edu
- errormail: xvm@mit.edu
- adminacl: system:xvm
+ errormail: *contact
  errormail_exclude:
-  - price
-  - ecprice
-  - andersk
+  - '*'
 
 vnc:
  base_port: 10003