In xvm-prodconfig:

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

diff --git a/master.yaml b/master.yaml
index 2d0c094..183af47 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -6,17 +6,47 @@ apt:
  keyid: 35AE3C4F
 
 authz:
  keyid: 35AE3C4F
 
 authz:

- - type: afs
-   cell: athena.mit.edu
-   auth: yes
- - type: afs
-   cell: sipb.mit.edu
-   auth: yes
+ 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
 
 
 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
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
  host: xvm.mit.edu

@@ -45,16 +75,6 @@ dns:
  zone_files:
   - /etc/invirt/zone
 
  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
    ip: 18.181.0.221
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
    ip: 18.181.0.221

@@ -102,6 +122,12 @@ web:
   - quentin
   - hartmans
 
   - quentin
   - hartmans
 

+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
+

 xen:
 xen:

- network:
-  iface: eth2
+ iface: eth2
+
+lvm:
+ vg: xenvg