In xvm-prodconfig:

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

diff --git a/master.yaml b/master.yaml
index 244e0d7..bf27214 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,22 +1,53 @@
 contact: &contact xvm@mit.edu
 contact: &contact xvm@mit.edu

-adminacl: system:xvm-root
+adminacl: &adminacl system:xvm-root

 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
  keyid: 35AE3C4F
 
 authz:
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
  keyid: 35AE3C4F
 
 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
 
 
 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

@@ -47,13 +78,23 @@ dns:
 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.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
    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
    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
    ip: 18.181.0.223
  - hostname: arklay-mansion.mit.edu

+   internal_ip: arklay-mansion-internal

    ip: 18.181.0.224
    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

 
 kerberos:
  realm: ATHENA.MIT.EDU
 
 kerberos:
  realm: ATHENA.MIT.EDU

@@ -92,6 +133,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