MIT DNS server renumbering

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

diff --git a/master.yaml b/master.yaml
index c849a07..4cb41e5 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -63,7 +63,7 @@ build:
 
 console:
  hostname: xvm-console.mit.edu
- ip: 18.181.0.134
+ ip: 18.25.128.134
 
 cluster:
  rings:
@@ -77,72 +77,70 @@ cluster:
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
  host: xvm.mit.edu
- ip: 18.181.0.62
+ ip: 18.25.128.62
  port: 5432
  user: invirt
  dbname: invirt
 
 dhcp:
- gateway: 18.181.0.1
- netmask: 255.255.0.0
+ leasetime: 3600
  dns:
-  - 18.70.0.160
-  - 18.71.0.151
-  - 18.72.0.3
+  - 18.0.70.160
+  - 18.0.71.151
+  - 18.0.72.3
  search_domain: mit.edu
 
 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
+    ip: 18.25.128.62
  zone_files:
   - /etc/invirt/zone
 
 hosts: # hosts on which VMs run
-# - hostname: citadel-station.mit.edu
-#   internal_ips:
-#    - 18.4.58.16
-#    - 18.5.58.16
-#   ip: 18.181.0.221
+ - hostname: citadel-station.mit.edu
+   internal_ips:
+    - 18.4.58.16
+    - 18.5.58.16
+   ip: 18.25.128.221
  - hostname: aperture-science.mit.edu
    internal_ips:
     - 18.4.58.17
     - 18.5.58.17
-   ip: 18.181.0.222
-# - 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
+   ip: 18.25.128.222
+ - hostname: shadow-moses.mit.edu
+   internal_ips:
+    - 18.4.58.18
+    - 18.5.58.18
+   ip: 18.25.128.223
+ - hostname: arklay-mansion.mit.edu
+   internal_ips:
+    - 18.4.58.19
+    - 18.5.58.19
+   ip: 18.25.128.224
+ - hostname: discovery-one.mit.edu
+   internal_ips:
+    - 18.4.58.20
+    - 18.5.58.20
+   ip: 18.25.128.225
+ - hostname: global-dynamics.mit.edu
+   internal_ips:
+    - 18.4.58.21
+    - 18.5.58.21
+   ip: 18.25.128.99
+ - hostname: babylon-four.mit.edu
+   internal_ips:
+    - 18.4.58.22
+    - 18.5.58.22
+   ip: 18.25.128.100
+ - hostname: moonbase-alpha.mit.edu
+   internal_ips:
+    - 18.4.58.23
+    - 18.5.58.23
+   ip: 18.25.128.101
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -152,22 +150,29 @@ mail:
 
 monitoring:
  - hostname: sipb-noc.mit.edu
-   ip: 18.181.0.65
+   ip: 18.4.60.65
    baseuri: http://sipb-noc.mit.edu/xvm/
 
 remote:
  hostname: xvm-remote.mit.edu
- ip: 18.181.0.188
+ ip: 18.25.128.188
 
 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
+ proxy_ip: 18.25.128.62
+ signing_keystore_path: /etc/invirt/secrets/codesign.keystore
+ signing_key_alias: cert-manager.com
 
 web:
  baseuri: https://xvm.mit.edu/
@@ -181,10 +186,9 @@ web:
   - quentin
   - gdb
   - mitchb
-
-network:
- netmask: 255.255.0.0
- gateway: 18.181.0.1
+  - achernya
+  - dvorak42
+  - glasgall
 
 xen:
  iface: xenbr2
@@ -201,6 +205,12 @@ iscsi:
  - ip: 18.4.59.139
    ifaces:
    - eth1
+ - ip: 18.4.58.160
+   ifaces:
+   - eth0
+ - ip: 18.4.59.160
+   ifaces:
+   - eth1
 
 lvm:
  vg: xenvg