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 b05bd19..c285bd4 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -83,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
@@ -95,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
@@ -123,26 +121,26 @@ hosts: # hosts on which VMs run
     - 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
+ - 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
@@ -152,7 +150,7 @@ 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:
@@ -162,12 +160,19 @@ 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/
@@ -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