Renumber the prod cluster... again

diff --git a/debian/changelog b/debian/changelog
index 5ae0961..bba2f31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.1.61) precise; urgency=medium
+
+  * Renumber the prod cluster... again.
+
+ -- Mitchell Berger <mitchb@mit.edu>  Fri, 19 Jul 2019 22:55:00 -0400
+
 xvm-prodconfig (1.1.60) precise; urgency=medium
 
   * Give s_console more RAM, since munin and consolefs appear to be

diff --git a/master.yaml b/master.yaml
index 2a3aebe..cc9d954 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -63,7 +63,7 @@ build:
 
 console:
  hostname: xvm-console.mit.edu
- ip: 18.49.0.134
+ ip: 18.25.128.134
 
 cluster:
  rings:
@@ -77,7 +77,7 @@ cluster:
 db:
  uri: postgres://invirt@xvm.mit.edu/invirt
  host: xvm.mit.edu
- ip: 18.49.0.62
+ ip: 18.25.128.62
  port: 5432
  user: invirt
  dbname: invirt
@@ -96,7 +96,7 @@ dns:
   - xvm.mit.edu
  nameservers:
   - hostname: xvm.mit.edu
-    ip: 18.49.0.62
+    ip: 18.25.128.62
  zone_files:
   - /etc/invirt/zone
 
@@ -105,42 +105,42 @@ hosts: # hosts on which VMs run
    internal_ips:
     - 18.4.58.16
     - 18.5.58.16
-   ip: 18.49.0.221
+   ip: 18.25.128.221
  - hostname: aperture-science.mit.edu
    internal_ips:
     - 18.4.58.17
     - 18.5.58.17
-   ip: 18.49.0.222
+   ip: 18.25.128.222
  - hostname: shadow-moses.mit.edu
    internal_ips:
     - 18.4.58.18
     - 18.5.58.18
-   ip: 18.49.0.223
+   ip: 18.25.128.223
  - hostname: arklay-mansion.mit.edu
    internal_ips:
     - 18.4.58.19
     - 18.5.58.19
-   ip: 18.49.0.224
+   ip: 18.25.128.224
  - hostname: discovery-one.mit.edu
    internal_ips:
     - 18.4.58.20
     - 18.5.58.20
-   ip: 18.49.0.225
+   ip: 18.25.128.225
  - hostname: global-dynamics.mit.edu
    internal_ips:
     - 18.4.58.21
     - 18.5.58.21
-   ip: 18.49.0.99
+   ip: 18.25.128.99
  - hostname: babylon-four.mit.edu
    internal_ips:
     - 18.4.58.22
     - 18.5.58.22
-   ip: 18.49.0.100
+   ip: 18.25.128.100
  - hostname: moonbase-alpha.mit.edu
    internal_ips:
     - 18.4.58.23
     - 18.5.58.23
-   ip: 18.49.0.101
+   ip: 18.25.128.101
 
 kerberos:
  realm: ATHENA.MIT.EDU
@@ -155,7 +155,7 @@ monitoring:
 
 remote:
  hostname: xvm-remote.mit.edu
- ip: 18.49.0.188
+ ip: 18.25.128.188
 
 git:
  uri: git://xvm.mit.edu
@@ -170,7 +170,7 @@ trac:
 
 vnc:
  base_port: 10003
- proxy_ip: 18.49.0.62
+ proxy_ip: 18.25.128.62
  signing_keystore_path: /etc/invirt/secrets/codesign.keystore
  signing_key_alias: cert-manager.com
 

diff --git a/sysvms/s_console b/sysvms/s_console
index cb29db3..77a8399 100644 (file)
--- a/sysvms/s_console
+++ b/sysvms/s_console
@@ -10,7 +10,7 @@ disk        = ['phy:xenvg/s_console_precise_xvda,xvda,w']
 
 name        = 's_console'
 
-vif         = [ 'ip=18.49.0.134,mac=00:16:3E:7E:E4:DE' ]
+vif         = [ 'ip=18.25.128.134,mac=00:16:3E:7E:E4:DE' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'

diff --git a/sysvms/s_master b/sysvms/s_master
index 153ff91..600e26b 100644 (file)
--- a/sysvms/s_master
+++ b/sysvms/s_master
@@ -11,7 +11,7 @@ disk        = ['phy:xenvg/s_master_precise_xvda,xvda,w',
 
 name        = 's_master'
 
-vif         = [ 'ip=18.49.0.62,mac=00:16:3E:5F:C1:8A' ]
+vif         = [ 'ip=18.25.128.62,mac=00:16:3E:5F:C1:8A' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'

diff --git a/sysvms/s_remote b/sysvms/s_remote
index 601fbcf..5a90952 100644 (file)
--- a/sysvms/s_remote
+++ b/sysvms/s_remote
@@ -10,7 +10,7 @@ disk        = ['phy:xenvg/s_remote_precise_xvda,xvda,w']
 
 name        = 's_remote'
 
-vif         = [ 'ip=18.49.0.188,mac=00:16:3E:7F:C2:55' ]
+vif         = [ 'ip=18.25.128.188,mac=00:16:3E:7F:C2:55' ]
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'

diff --git a/zone b/zone
index e5c18a0..ea468d3 100644 (file)
--- a/zone
+++ b/zone
@@ -1,5 +1,5 @@
 @       900     IN      SOA     xvm.mit.edu. xvm.mit.edu. (
-        3
+        4
         1d
         1d
         1d
@@ -7,7 +7,7 @@
         )
 
 ; Our services
-ns1             IN      A       18.49.0.62
+ns1             IN      A       18.25.128.62
 remote          IN      TXT     "reserved to prevent confusion with an XVM server"
 console         IN      TXT     "reserved to prevent confusion with an XVM server"
 prod            IN      TXT     "reserved for the XVM production cluster"