X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/ad5c42e3b7003045f433e3836d5ebbe86b2b3d04..HEAD:/master.yaml

diff --git a/master.yaml b/master.yaml
index 0572f54..894b6d5 100644
--- a/master.yaml
+++ b/master.yaml
@@ -3,7 +3,7 @@ adminacl: &adminacl system:xvm-root
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
- keyid: 35AE3C4F
+ keyid: 442461DF
 
 authz:
  name: xvm-locker
@@ -19,21 +19,47 @@ authz:
     auth: no
   - cell: net.mit.edu
     auth: no
-  - cell: dev.mit.edu
-    auth: no
 
 build:
  pockets:
   prod:
    acl: *adminacl
    apt: stable
+   distro: hardy
+  precise-prod:
+   acl: *adminacl
+   apt: precise-stable
+   distro: precise
   dev:
-   acl: system:xvm-dev
+   acl: *adminacl
    apt: unstable
    allow_backtracking: yes
+   distro: hardy
+  precise-dev:
+   acl: *adminacl
+   apt: precise-unstable
+   allow_backtracking: yes
+   distro: precise
  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_access: system:xvm-dev
+ repo_admin: system:xvm-root
 
 console:
  hostname: xvm-console.mit.edu
@@ -41,10 +67,10 @@ console:
 
 cluster:
  rings:
-  - bind: 10.5.128.0
+  - bind: 18.4.58.0
     mcast: 239.255.252.0
     port: 5405
-  - bind: 10.6.128.0
+  - bind: 18.4.59.0
     mcast: 239.255.252.1
     port: 5405
 
@@ -98,6 +124,9 @@ hosts: # hosts on which VMs run
  - hostname: babylon-four.mit.edu
    internal_ip: babylon-four-internal
    ip: 18.181.0.100
+ - hostname: moonbase-alpha.mit.edu
+   internal_ip: moonbase-alpha-internal
+   ip: 18.181.0.101
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -106,16 +135,16 @@ mail:
  forward: *priv_contact
 
 monitoring:
- - hostname: syn.mit.edu
+ - hostname: sipb-noc.mit.edu
    ip: 18.181.0.65
+   baseuri: http://sipb-noc.mit.edu/xvm/
 
 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
@@ -127,14 +156,15 @@ vnc:
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: *contact
+ errormail: xvm-errors@mit.edu
  errormail_exclude:
   - broder
   - price
   - ecprice
   - andersk
   - quentin
-  - hartmans
+  - gdb
+  - mitchb
 
 network:
  netmask: 255.255.0.0
@@ -143,5 +173,18 @@ network:
 xen:
  iface: eth2
 
+iscsi:
+ targets:
+ - ip: 18.4.58.128
+   ifaces:
+   - eth0
+   - eth1
+ - ip: 18.4.58.139
+   ifaces:
+   - eth0
+ - ip: 18.4.59.139
+   ifaces:
+   - eth1
+
 lvm:
  vg: xenvg