From 62d3e1dcaace5cb86a5226428b52e3fb6e27e76b Mon Sep 17 00:00:00 2001 From: Mitchell E Berger Date: Mon, 28 May 2018 00:42:01 -0400 Subject: [PATCH] Phase 1 changes for new software related to the mass renumbering. --- debian/changelog | 12 ++++++++++++ master.yaml | 14 +------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index c03e2de..28c6dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +xvm-prodconfig (1.1.58) 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 old sipb-noc address from monitoring and noc sections + * Remove network section from master.yaml + + -- Mitchell Berger Mon, 28 May 2018 00:41:00 -0400 + xvm-prodconfig (1.1.57) precise; urgency=medium * Make noc a list diff --git a/master.yaml b/master.yaml index bae55e6..c285bd4 100644 --- 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 @@ -152,9 +150,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/ @@ -168,9 +163,6 @@ git: noc: - dbname: template1 user: nagios - ip: 18.181.0.65 - - dbname: template1 - user: nagios ip: 18.4.60.65 trac: @@ -198,10 +190,6 @@ web: - dvorak42 - glasgall -network: - netmask: 255.255.0.0 - gateway: 18.181.0.1 - xen: iface: xenbr2 -- 1.7.9.5