Added xvm-support-config dependency.

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

diff --git a/master.yaml b/master.yaml
index f37151f..c849a07 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -19,8 +19,6 @@ authz:
     auth: no
   - cell: net.mit.edu
     auth: no
     auth: no
   - cell: net.mit.edu
     auth: no

-  - cell: dev.mit.edu
-    auth: no

 
 build:
  pockets:
 
 build:
  pockets:

@@ -28,6 +26,10 @@ build:
    acl: *adminacl
    apt: stable
    distro: hardy
    acl: *adminacl
    apt: stable
    distro: hardy

+  precise-prod:
+   acl: *adminacl
+   apt: precise-stable
+   distro: precise

   dev:
    acl: *adminacl
    apt: unstable
   dev:
    acl: *adminacl
    apt: unstable

@@ -66,10 +68,10 @@ console:
 cluster:
  rings:
   - bind: 18.4.58.0
 cluster:
  rings:
   - bind: 18.4.58.0

-    mcast: 239.255.252.0
+    mcast: 239.255.252.2

     port: 5405
   - bind: 18.4.59.0
     port: 5405
   - bind: 18.4.59.0

-    mcast: 239.255.252.1
+    mcast: 239.255.252.3

     port: 5405
 
 db:
     port: 5405
 
 db:

@@ -101,30 +103,46 @@ dns:
   - /etc/invirt/zone
 
 hosts: # hosts on which VMs run
   - /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
  - 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
    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
 
 kerberos:
  realm: ATHENA.MIT.EDU

@@ -169,7 +187,7 @@ network:
  gateway: 18.181.0.1
 
 xen:
  gateway: 18.181.0.1
 
 xen:

- iface: eth2
+ iface: xenbr2

 
 iscsi:
  targets:
 
 iscsi:
  targets: