Fixed zone and cluster list

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

diff --git a/master.yaml b/master.yaml
index 4471a43..6a88377 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -5,7 +5,7 @@ kerberos:
  realm: ATHENA.MIT.EDU
 
 apt:
- keyid: 5E0DB194
+ keyid: 625CFE85
 
 authz:
  name: xvm-locker
@@ -25,14 +25,22 @@ authz:
     auth: no
 
 build:
+ mirror: true
  pockets:
   prod:
    acl: system:xvm-root
    apt: stable
+   distro: hardy
   dev:
    acl: system:xvm-dev
    apt: unstable
    allow_backtracking: yes
+   distro: hardy
+  precise-dev:
+   acl: system:xvm-dev
+   apt: precise-unstable
+   allow_backtracking: yes
+   distro: precise
  tagger:
   name: Invirt Build Server
   email: invirt@mit.edu
@@ -60,15 +68,15 @@ cluster:
     port: 5405
 
 hosts: # hosts on which VMs run
- - hostname: black-mesa.mit.edu
-   ip: 18.181.0.60
-   internal_ip: black-mesa-internal
- - hostname: torchwood-institute.mit.edu
-   internal_ip: torchwood-institute-internal
-   ip: 18.181.0.165
- - hostname: arkham-asylum.mit.edu
-   internal_ip: arkham-asylum-internal
-   ip: 18.181.0.109
+# - hostname: black-mesa.mit.edu
+#   ip: 18.181.0.60
+#   internal_ip: black-mesa-internal
+# - hostname: torchwood-institute.mit.edu
+#   internal_ip: torchwood-institute-internal
+#   ip: 18.181.0.165
+# - hostname: arkham-asylum.mit.edu
+#   internal_ip: arkham-asylum-internal
+#   ip: 18.181.0.109
  - hostname: isla-nublar.mit.edu
    internal_ip: isla-nublar-internal
    ip: 18.181.0.102
@@ -82,22 +90,24 @@ db:
  dbname: invirt
 
 console:
- hostname: xvm-console-dev.mit.edu
- ip: 18.181.0.230
+ hostname: xvm-console-staging.mit.edu
+ ip: 18.181.0.219
 
 remote:
- hostname: xvm-remote-dev.mit.edu
- ip: 18.181.0.231
+ hostname: xvm-remote-staging.mit.edu
+ ip: 18.181.0.216
 
 dns:
  contact: *contact
  domains:  # first one is advertised
-  - dev.xvm.mit.edu
+  - staging.xvm.mit.edu
   - 2.181.18.in-addr.arpa
   - 1.181.18.in-addr.arpa
  nameservers:
-  - hostname: xvm-dev.mit.edu
-    ip: 18.181.0.80
+  - hostname: xvm-staging.mit.edu
+    ip: 18.181.0.214
+ zone_files:
+  - /etc/invirt/zone
 
 dhcp:
  gateway: 18.181.0.1
@@ -122,8 +132,8 @@ xen:
  iface: eth0
 
 web:
- baseuri: https://xvm-dev.mit.edu/
- hostname: xvm-dev.mit.edu
+ baseuri: https://xvm-staging.mit.edu/
+ hostname: xvm-staging.mit.edu
  errormail: *contact
  errormail_exclude:
   - '*'
@@ -138,3 +148,4 @@ trac:
 monitoring:
  - hostname: sipb-noc.mit.edu
    ip: 18.181.0.65
+   baseuri: http://sipb-noc.mit.edu/xvm/