X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/2b4a276e6a366127939ad7111ac3d78a1d121f39..799ada39ddc9df144262566bf18ed402c18d7dc5:/master.yaml

diff --git a/master.yaml b/master.yaml
index 183af47..c97e0db 100644
--- a/master.yaml
+++ b/master.yaml
@@ -3,9 +3,10 @@ adminacl: &adminacl system:xvm-root
 priv_contact: &priv_contact xvm-root@mit.edu
 
 apt:
- keyid: 35AE3C4F
+ keyid: 442461DF
 
 authz:
+ name: xvm-locker
  afs:
   cells:
   - cell: athena.mit.edu
@@ -18,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
@@ -40,11 +67,11 @@ console:
 
 cluster:
  rings:
-  - bind: 10.5.128.0
-    mcast: 239.255.252.0
+  - bind: 18.4.58.0
+    mcast: 239.255.252.2
     port: 5405
-  - bind: 10.6.128.0
-    mcast: 239.255.252.1
+  - bind: 18.4.59.0
+    mcast: 239.255.252.3
     port: 5405
 
 db:
@@ -77,13 +104,45 @@ dns:
 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
+   internal_ips:
+    - 18.4.58.16
+    - 18.5.58.16
    ip: 18.181.0.221
  - hostname: aperture-science.mit.edu
+   internal_ips:
+    - 18.4.58.17
+    - 18.5.58.17
    ip: 18.181.0.222
  - hostname: shadow-moses.mit.edu
+   internal_ips:
+    - 18.4.58.18
+    - 18.5.58.18
    ip: 18.181.0.223
  - hostname: arklay-mansion.mit.edu
+   internal_ips:
+    - 18.4.58.19
+    - 18.5.58.19
    ip: 18.181.0.224
+ - hostname: discovery-one.mit.edu
+   internal_ips:
+    - 18.4.58.20
+    - 18.5.58.20
+   ip: 18.181.0.225
+ - hostname: global-dynamics.mit.edu
+   internal_ips:
+    - 18.4.58.21
+    - 18.5.58.21
+   ip: 18.181.0.99
+ - hostname: babylon-four.mit.edu
+   internal_ips:
+    - 18.4.58.22
+    - 18.5.58.22
+   ip: 18.181.0.100
+ - hostname: moonbase-alpha.mit.edu
+   internal_ips:
+    - 18.4.58.23
+    - 18.5.58.23
+   ip: 18.181.0.101
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -92,16 +151,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
@@ -113,21 +172,38 @@ 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
+  - achernya
+  - dvorak42
+  - glasgall
 
 network:
  netmask: 255.255.0.0
  gateway: 18.181.0.1
 
 xen:
- iface: eth2
+ iface: xenbr2
+
+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