Add an authz.name option to xvm-{prod,dev}config.

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

diff --git a/master.yaml b/master.yaml
index b4de061..2791b9c 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -6,7 +6,7 @@ apt:
  keyid: 35AE3C4F
 
 authz:
- mech: invirt.authz.locker
+ name: xvm-locker
  afs:
   cells:
   - cell: athena.mit.edu
@@ -39,6 +39,15 @@ 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
@@ -69,12 +78,16 @@ dns:
 
 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
 
 kerberos:
@@ -114,6 +127,12 @@ web:
   - quentin
   - hartmans
 
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
+
 xen:
- network:
-  iface: eth2
+ iface: eth2
+
+lvm:
+ vg: xenvg