Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove csw2-esams public IPs, csw1-esams
......................................................................
Remove csw2-esams public IPs, csw1-esams
Only csw2-esams.mgmt.esams.wmnet left (and asw-esams)
Change-Id: Ibf7a3920c04eee3a4b9745b0c69c687a7df68ffb
---
M templates/10.in-addr.arpa
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 6 insertions(+), 22 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 17e7ce9..6837621 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -211,7 +211,6 @@
86 1H IN PTR amssq61.mgmt.esams.wmnet.
87 1H IN PTR amssq62.mgmt.esams.wmnet.
-102 1H IN PTR csw1-esams.mgmt.esams.wmnet.
104 1H IN PTR asw-esams.mgmt.esams.wmnet.
105 1H IN PTR csw2-esams.mgmt.esams.wmnet.
106 1H IN PTR amslvs1.mgmt.esams.wmnet.
@@ -276,7 +275,7 @@
170 1H IN PTR cp3049.mgmt.esams.wmnet.
210 1H IN PTR scs1-esams.mgmt.esams.wmnet.
-211 1H IN PTR ge-0-0-47.csw2-esams.wikimedia.org.
+
212 1H IN PTR ae1-200.cr1-esams.wikimedia.org.
213 1H IN PTR ae1-200.cr2-knams.wikimedia.org.
diff --git a/templates/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index 8bc1ddc..11a03ca 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -37,7 +37,7 @@
121 1H IN PTR eeden.esams.wikimedia.org.
122 1H IN PTR maerlant.wikimedia.org.
-; empty: 91.198.174.128/26 (91.198.174.128 - 91.198.174.191)
+; unused 91.198.174.128/26 (91.198.174.128 - 91.198.174.191)
; 91.198.174.192/27 LVS service IPs
@@ -69,10 +69,7 @@
239 1H IN PTR ns2.wikimedia.org.
-; Neighbor block between cr2-knams and csw2-esams (91.198.174.240/31)
-
-240 1H IN PTR ae1-402.cr2-knams.wikimedia.org.
-241 1H IN PTR vl402.csw2-esams.wikimedia.org.
+; unused 91.198.174.240/31
; Temp Neighbor block between cr1-esams and cr2-knams (91.198.174.242/31)
@@ -81,7 +78,7 @@
; Loopback ips
-244 1H IN PTR csw2-esams.wikimedia.org.
+;244
245 1H IN PTR cr1-esams.wikimedia.org.
246 1H IN PTR cr2-knams.wikimedia.org.
247 1H IN PTR mr1-esams.wikimedia.org.
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index d0b2668..aaf5f1b 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -171,12 +171,9 @@
$ORIGIN 2.0.e.f.{{ zonename }}.
-; csw2-esams <--> cr2-knams (2620:0:862:fe03::/64)
+; unused (2620:0:862:fe03::/64)
$ORIGIN 3.0.e.f.{{ zonename }}.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae1-402.cr2-knams.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vl402.csw2-esams.wikimedia.org.
; cr1-esams <--> mr1-esams (2620:0:862:fe04::/64)
@@ -204,6 +201,6 @@
$ORIGIN f.f.f.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR mr1-esams.wikimedia.org.
-3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR csw2-esams.wikimedia.org.
+
4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-knams.wikimedia.org.
5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-esams.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e131aef..50e8d69 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -350,12 +350,6 @@
cr2-ulsfo 1H IN A 198.35.26.193
IN AAAA 2620:0:863:ffff::2
-csw1-esams 1H IN A 91.198.174.247
- 1H IN AAAA 2620:0:862:ffff::1
-
-csw2-esams 1H IN A 91.198.174.244
- 1H IN AAAA 2620:0:862:ffff::3
-
mr1-eqiad 1H IN A 208.80.154.201
mr1-esams 1H IN A 91.198.174.247
@@ -404,8 +398,6 @@
vl1020-eth3.lvs1004 1H IN A 10.64.49.4
vl1020-eth3.lvs1005 1H IN A 10.64.49.5
vl1020-eth3.lvs1006 1H IN A 10.64.49.6
-
-csw1-knams 1H IN CNAME csw1-esams
pfw1-eqiad 1H IN A 208.80.154.218
pfw2-eqiad 1H IN A 208.80.154.219
diff --git a/templates/wmnet b/templates/wmnet
index 5fdbe5e..941896e 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3335,7 +3335,6 @@
amssq62 1H IN A 10.21.0.87
cr1-esams 1H IN A 10.21.0.116
-csw1-esams 1H IN A 10.21.0.102
asw-esams 1H IN A 10.21.0.104
csw2-esams 1H IN A 10.21.0.105
amslvs1 1H IN A 10.21.0.106
--
To view, visit https://gerrit.wikimedia.org/r/201191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf7a3920c04eee3a4b9745b0c69c687a7df68ffb
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
