Phase 1 changes for new software related to the mass renumbering.

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

diff --git a/master.yaml b/master.yaml
index 0ec89a3..c285bd4 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -19,18 +19,27 @@ 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
@@ -49,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:
@@ -57,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:
@@ -73,8 +83,7 @@ db:
  dbname: invirt
 
 dhcp:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
+ leasetime: 3600
  dns:
   - 18.70.0.160
   - 18.71.0.151
@@ -85,7 +94,6 @@ dns:
  contact: *contact
  domains: # first one is advertised
   - xvm.mit.edu
-  - 2.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm.mit.edu
     ip: 18.181.0.62
@@ -94,26 +102,45 @@ dns:
 
 hosts: # hosts on which VMs run
  - hostname: citadel-station.mit.edu
-   internal_ip: citadel-station-internal
+   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
+   internal_ips:
+    - 18.4.58.18
+    - 18.5.58.18
    ip: 18.181.0.223
  - hostname: arklay-mansion.mit.edu
-   internal_ip: arklay-mansion-internal
+   internal_ips:
+    - 18.4.58.19
+    - 18.5.58.19
    ip: 18.181.0.224
  - hostname: discovery-one.mit.edu
-   internal_ip: discovery-one-internal
+   internal_ips:
+    - 18.4.58.20
+    - 18.5.58.20
    ip: 18.181.0.225
  - hostname: global-dynamics.mit.edu
-   internal_ip: global-dynamics-internal
+   internal_ips:
+    - 18.4.58.21
+    - 18.5.58.21
    ip: 18.181.0.99
  - hostname: babylon-four.mit.edu
-   internal_ip: babylon-four-internal
+   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
@@ -122,8 +149,9 @@ mail:
  forward: *priv_contact
 
 monitoring:
- - hostname: syn.mit.edu
-   ip: 18.181.0.65
+ - hostname: sipb-noc.mit.edu
+   ip: 18.4.60.65
+   baseuri: http://sipb-noc.mit.edu/xvm/
 
 remote:
  hostname: xvm-remote.mit.edu
@@ -132,17 +160,24 @@ remote:
 git:
  uri: git://xvm.mit.edu
 
+noc:
+ - dbname: template1
+   user: nagios
+   ip: 18.4.60.65
+
 trac:
  uri: https://xvm.scripts.mit.edu
 
 vnc:
  base_port: 10003
  proxy_ip: 18.181.0.62
+ signing_keystore_path: /etc/invirt/secrets/codesign.keystore
+ signing_key_alias: cert-manager.com
 
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
- errormail: *contact
+ errormail: xvm-errors@mit.edu
  errormail_exclude:
   - broder
   - price
@@ -150,24 +185,30 @@ web:
   - andersk
   - quentin
   - gdb
-
-network:
- netmask: 255.255.0.0
- gateway: 18.181.0.1
+  - mitchb
+  - achernya
+  - dvorak42
+  - glasgall
 
 xen:
- iface: eth2
+ iface: xenbr2
 
 iscsi:
  targets:
- - ip: 10.5.128.128
+ - ip: 18.4.58.128
    ifaces:
    - eth0
    - eth1
- - ip: 10.5.128.139
+ - ip: 18.4.58.139
+   ifaces:
+   - eth0
+ - ip: 18.4.59.139
+   ifaces:
+   - eth1
+ - ip: 18.4.58.160
    ifaces:
    - eth0
- - ip: 10.6.128.139
+ - ip: 18.4.59.160
    ifaces:
    - eth1