* Remove gateway and netmask from dhcp section

  * Add leasetime to dhcp section, crank it down from default 1d to 1h
  * Get rid of bogus 2.181.18.in-addr.arpa authoritative zone; that's
    not our subnet, and we act authoritative for reverse addresses that
    are in our database anyway.
  * Remove symbolic -internal names of hosts since they're not actually
    defined anywhere, and populate the actual internal IPs of the hosts,
    so migrations may be possible.
  * Remove old sipb-noc address from monitoring and noc sections.

diff --git a/debian/changelog b/debian/changelog
index 46ef508..e9f2ce1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xvm-devconfig (0.91) precise; urgency=medium
+
+  * Remove gateway and netmask from dhcp section
+  * Add leasetime to dhcp section, crank it down from default 1d to 1h
+  * Get rid of bogus 2.181.18.in-addr.arpa authoritative zone; that's
+    not our subnet, and we act authoritative for reverse addresses that
+    are in our database anyway.
+  * Remove symbolic -internal names of hosts since they're not actually
+    defined anywhere, and populate the actual internal IPs of the hosts,
+    so migrations may be possible.
+  * Remove old sipb-noc address from monitoring and noc sections.
+
+ -- Mitchell Berger <mitchb@mit.edu>  Wed, 16 May 2018 06:00:00 -0400
+
 xvm-devconfig (0.90) precise; urgency=medium
 
   * Make noc a list

diff --git a/master.yaml b/master.yaml
index 0e2b49c..a355163 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -81,8 +81,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
@@ -93,7 +92,6 @@ dns:
  contact: *contact
  domains: # first one is advertised
   - dev.xvm.mit.edu
-  - 2.181.18.in-addr.arpa
  nameservers:
   - hostname: xvm-dev.mit.edu
     ip: 18.181.0.80
@@ -103,19 +101,23 @@ dns:
 hosts: # hosts on which VMs run
  - hostname: black-mesa.mit.edu
    internal_ips:
-    - black-mesa-internal
+    - 10.7.0.3
+    - 10.8.0.3
    ip: 18.181.0.60
  - hostname: torchwood-institute.mit.edu
    internal_ips:
-    - torchwood-institute-internal
+    - 10.7.0.5
+    - 10.8.0.5
    ip: 18.181.0.165
  - hostname: arkham-asylum.mit.edu
    internal_ips:
-    - arkham-asylum-internal
+    - 10.7.0.2
+    - 10.8.0.2
    ip: 18.181.0.109
  - hostname: isla-nublar.mit.edu
    internal_ips:
-    - isla-nublar-internal
+    - 10.7.0.4
+    - 10.8.0.4
    ip: 18.181.0.102
 
 kerberos:
@@ -126,9 +128,6 @@ mail:
 
 monitoring:
  - hostname: sipb-noc.mit.edu
-   ip: 18.181.0.65
-   baseuri: http://sipb-noc.mit.edu/xvm/
- - hostname: sipb-noc.mit.edu
    ip: 18.4.60.65
    baseuri: http://sipb-noc.mit.edu/xvm/
 
@@ -142,9 +141,6 @@ git:
 noc:
  - dbname: template1
    user: nagios
-   ip: 18.181.0.65
- - dbname: template1
-   user: nagios
    ip: 18.4.60.65
 
 trac: