Fixed zone and cluster list

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

diff --git a/master.yaml b/master.yaml
index 8ec1f1e..6a88377 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -5,7 +5,7 @@ kerberos:
  realm: ATHENA.MIT.EDU
 
 apt:
  realm: ATHENA.MIT.EDU
 
 apt:

- keyid: 5E0DB194
+ keyid: 625CFE85

 
 authz:
  name: xvm-locker
 
 authz:
  name: xvm-locker

@@ -68,15 +68,15 @@ cluster:
     port: 5405
 
 hosts: # hosts on which VMs run
     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
  - hostname: isla-nublar.mit.edu
    internal_ip: isla-nublar-internal
    ip: 18.181.0.102

@@ -90,22 +90,22 @@ db:
  dbname: invirt
 
 console:
  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:
 
 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
 
 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:
   - 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
 
  zone_files:
   - /etc/invirt/zone
 

@@ -132,8 +132,8 @@ xen:
  iface: eth0
 
 web:
  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:
   - '*'
  errormail: *contact
  errormail_exclude:
   - '*'