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

diff --git a/master.yaml b/master.yaml
index 75e4d04..c849a07 100644
--- a/master.yaml
+++ b/master.yaml
@@ -19,8 +19,6 @@ authz:
     auth: no
   - cell: net.mit.edu
     auth: no
-  - cell: dev.mit.edu
-    auth: no
 
 build:
  pockets:
@@ -28,13 +26,17 @@ build:
    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: system:xvm-dev
+   acl: *adminacl
    apt: precise-unstable
    allow_backtracking: yes
    distro: precise
@@ -56,6 +58,7 @@ build:
   post_submit: *post_commit
   failed_submit: *post_commit
   post_add_repo: *post_commit
+ repo_access: system:xvm-dev
  repo_admin: system:xvm-root
 
 console:
@@ -65,10 +68,10 @@ console:
 cluster:
  rings:
   - bind: 18.4.58.0
-    mcast: 239.255.252.0
+    mcast: 239.255.252.2
     port: 5405
   - bind: 18.4.59.0
-    mcast: 239.255.252.1
+    mcast: 239.255.252.3
     port: 5405
 
 db:
@@ -100,30 +103,46 @@ dns:
   - /etc/invirt/zone
 
 hosts: # hosts on which VMs run
- - hostname: citadel-station.mit.edu
-   internal_ip: citadel-station-internal
-   ip: 18.181.0.221
+# - 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_ip: aperture-science-internal
+   internal_ips:
+    - 18.4.58.17
+    - 18.5.58.17
    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
- - hostname: moonbase-alpha.mit.edu
-   internal_ip: moonbase-alpha-internal
-   ip: 18.181.0.101
+# - 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
@@ -153,7 +172,7 @@ vnc:
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: *contact
+ errormail: xvm-errors@mit.edu
  errormail_exclude:
   - broder
   - price
@@ -168,7 +187,7 @@ network:
  gateway: 18.181.0.1
 
 xen:
- iface: eth2
+ iface: xenbr2
 
 iscsi:
  targets: