Bump the changelog

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

diff --git a/master.yaml b/master.yaml
index 0d8c298..c3fe96d 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,18 +1,69 @@
-apt:
- keyid: 35AE3C4F
+contact: &contact xvm@mit.edu
+adminacl: &adminacl system:xvm-root
+priv_contact: &priv_contact xvm-root@mit.edu
 
-authn:
- - type: kerberos
-   realm: ATHENA.MIT.EDU
+apt:
+ keyid: 442461DF
 
 authz:
- - type: afs
-   cell: athena.mit.edu
+ 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
+ hooks:
+  post_build: &post_build
+   zephyr:
+    class: xvm-auto
+   mail:
+    to: xvm-auto@mit.edu
+    from: xvm-build-bot@mit.edu
+  failed_build: *post_build
+  post_commit: &post_commit
+   zephyr:
+    class: xvm-auto
+  pre_build: *post_commit
+  post_submit: *post_commit
+  failed_submit: *post_commit
+  post_add_repo: *post_commit
+ repo_admin: system:xvm-root
 
 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
@@ -31,9 +82,10 @@ dhcp:
  search_domain: mit.edu
 
 dns:
- contact: xvm@mit.edu
+ contact: *contact
  domains: # first one is advertised
   - xvm.mit.edu
+  - 2.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm.mit.edu
     ip: 18.181.0.62
@@ -42,13 +94,32 @@ 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
+ - 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
+ - hostname: babylon-four.mit.edu
+   internal_ip: babylon-four-internal
+   ip: 18.181.0.100
+
+kerberos:
+ realm: ATHENA.MIT.EDU
+
+mail:
+ forward: *priv_contact
 
 monitoring:
  - hostname: syn.mit.edu
@@ -58,9 +129,8 @@ remote:
  hostname: xvm-remote.mit.edu
  ip: 18.181.0.188
 
-svn:
- repopath: /afs/sipb.mit.edu/project/xvm/svn
- uri: https://xvm.mit.edu:1111
+git:
+ uri: git://xvm.mit.edu
 
 trac:
  uri: https://xvm.scripts.mit.edu
@@ -72,8 +142,7 @@ vnc:
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: xvm@mit.edu
- adminacl: system:xvm-root
+ errormail: *contact
  errormail_exclude:
   - broder
   - price
@@ -81,3 +150,14 @@ web:
   - andersk
   - quentin
   - hartmans
+  - gdb
+
+network:
+ netmask: 255.255.0.0
+ gateway: 18.181.0.1
+
+xen:
+ iface: eth2
+
+lvm:
+ vg: xenvg