Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove cr1-sdtpa/csw1-sdtpa, fix crosslinks DNS
......................................................................
Remove cr1-sdtpa/csw1-sdtpa, fix crosslinks DNS
Change-Id: I8a4fdcd8c2d58d5027e8244faa5843bc4ba65f98
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/152.80.208.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
7 files changed, 11 insertions(+), 57 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 3962279..b82237b 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -22,7 +22,6 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-100.wikimedia.org.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-100.cr1-sdtpa.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-100.cr2-pmtpa.wikimedia.org.
@@ -57,7 +56,6 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
vrrp-gw-101.wikimedia.org.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-101.cr1-sdtpa.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-101.cr2-pmtpa.wikimedia.org.
; Machines
@@ -74,7 +72,6 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-102.wikimedia.org.
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-102.cr1-sdtpa.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR
ae0-102.cr2-pmtpa.wikimedia.org.
6.2.2.0.2.5.1.0.0.8.0.0.8.0.2.0 1H IN PTR amaranth.toolserver.org.
@@ -90,19 +87,10 @@
$ORIGIN e.f.{{ zonename }}.
-; cr1-sdtpa <--> cr2-pmtpa (2620:0:860:fe00::/64)
-
-$ORIGIN 0.0.e.f.{{ zonename }}.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
ae0-400.cr1-sdtpa.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
ae0-400.cr2-pmtpa.wikimedia.org.
-
; Loopback IPs
$ORIGIN f.f.f.f.{{ zonename }}.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR csw1-sdtpa.wikimedia.org.
3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR pim-rp.wikimedia.org.
-4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-sdtpa.wikimedia.org.
5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-pmtpa.wikimedia.org.
diff --git a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0fde67b..56a0eae 100644
--- a/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/1.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -240,17 +240,17 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr1-eqiad.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR ae0.cr2-eqiad.wikimedia.org.
-; cr1-eqiad <--> cr1-sdtpa (2620:0:861:fe01::/64)
+; cr1-eqiad <--> cr2-pmtpa (2620:0:861:fe01::/64)
$ORIGIN 1.0.e.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-1.cr1-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-1.cr1-sdtpa.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-0.cr2-pmtpa.wikimedia.org.
-; cr2-eqiad <--> cr1-sdtpa (2620:0:861:fe02::/64)
+; cr2-eqiad <--> cr2-pmtpa (2620:0:861:fe02::/64)
$ORIGIN 2.0.e.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-1.cr2-eqiad.wikimedia.org.
-2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-1-1-0.cr1-sdtpa.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-1-1-0.cr2-pmtpa.wikimedia.org.
; cr2-eqiad <--> cr2-knams GRE (2620:0:861:fe03::/64)
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 3510835..43688b3 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -32,7 +32,6 @@
200 1H IN PTR vrrp-gw-2.pmtpa.wmnet.
-201 1H IN PTR ae0-2.cr1-sdtpa.wikimedia.org.
202 1H IN PTR ae0-2.cr2-pmtpa.wikimedia.org.
224 1H IN PTR es10.pmtpa.wmnet.
@@ -112,9 +111,7 @@
14 1H IN PTR asw-b5-sdtpa.net.mgmt.pmtpa.wmnet.
15 1H IN PTR msw1-pmtpa.mgmt.pmtpa.wmnet.
16 1H IN PTR msw1-sdtpa.mgmt.pmtpa.wmnet.
-17 1H IN PTR cr1-sdtpa.mgmt.pmtpa.wmnet.
18 1H IN PTR cr2-pmtpa.mgmt.pmtpa.wmnet.
-19 1H IN PTR csw1-sdtpa.mgmt.pmtpa.wmnet.
20 1H IN PTR asw2-d3-sdtpa.mgmt.pmtpa.wmnet.
21 1H IN PTR asw-d-pmtpa.mgmt.pmtpa.wmnet.
@@ -293,31 +290,16 @@
$ORIGIN 0.3.{{ zonename }}.
-; Cross link between nfs1/nfs2: 10.3.0.0/30
+; Cross link between cr2-pmtpa and mr1-pmtpa: 10.3.0.8/30
-1 1H IN PTR nfs1-xlink0.pmtpa.wmnet.
-2 1H IN PTR nfs2-xlink0.pmtpa.wmnet.
-
-; Cross link between cr2-pmtpa and mr1-pmtpa: 10.3.0.4/30
-
-5 1H IN PTR ae0-402.cr2-pmtpa.wikimedia.org.
-6 1H IN PTR fe-0-0-1.mr1-pmtpa.wikimedia.org.
-
-; Cross link between cr1-sdtpa and mr1-pmtpa: 10.3.0.8/30
-
-9 1H IN PTR ae0-402.cr1-sdtpa.wikimedia.org.
+9 1H IN PTR ae0-402.cr2-pmtpa.wikimedia.org.
10 1H IN PTR fe-0-0-2-402.mr1-pmtpa.wikimedia.org.
; Loopbacks 10.3.0.12/30
12 1H IN PTR mr1-pmtpa.mgmt.pmtpa.wmnet.
-; TEMP cross link between cr1-sdtpa and csw1-sdtpa: 10.3.0.16/30
-
-17 1H IN PTR ae0-404.cr1-sdtpa.wikimedia.org.
-18 1H IN PTR ve2.csw1-sdtpa.wikimedia.org.
-
-; pmtpa/sdtpa wireless access network 10.3.1.0/24
+; pmtpa wireless access network 10.3.1.0/24
1 1H IN PTR fe-0-0-3.mr1-pmtpa.wikimedia.org.
2 1H IN PTR wr1.pmtpa.wikimedia.org.
@@ -335,7 +317,6 @@
11 1H IN PTR labsdb2.pmtpa.wmnet.
12 1H IN PTR labsdb3.pmtpa.wmnet.
-252 1H IN PTR ae0-105.cr1-sdtpa.wikimedia.org.
253 1H IN PTR ae0-105.cr2-pmtpa.wikimedia.org.
;
diff --git a/templates/152.80.208.in-addr.arpa
b/templates/152.80.208.in-addr.arpa
index 6068260..26f0913 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -23,7 +23,6 @@
32 1H IN PTR virt0.wikimedia.org.
33 1H IN PTR labs-ns0.wikimedia.org.
-125 1H IN PTR ae0-100.cr1-sdtpa.wikimedia.org.
126 1H IN PTR ae0-100.cr2-pmtpa.wikimedia.org.
@@ -38,7 +37,6 @@
137 1H IN PTR torrus.wikimedia.org.
141 1H IN PTR wireless.tech.wikimedia.org.
143 1H IN PTR url-downloader.wikimedia.org.
-144 1H IN PTR ae0-101.cr1-sdtpa.wikimedia.org.
145 1H IN PTR ae0-101.cr2-pmtpa.wikimedia.org.
154 1H IN PTR pdf2.wikimedia.org.
@@ -61,15 +59,9 @@
; Neighbor blocks, loopback IPs 208.80.152.192/27 (208.80.152.192 -
208.80.152.223)
-193 1H IN PTR csw1-sdtpa.wikimedia.org.
194 1H IN PTR pim-rp.wikimedia.org.
-196 1H IN PTR cr1-sdtpa.wikimedia.org.
197 1H IN PTR cr2-pmtpa.wikimedia.org.
-
-; 208.80.152.198/31 (cr1-sdtpa <--> cr2-pmtpa )
-198 1H IN PTR ae0-404.cr1-sdtpa.wikimedia.org.
-199 1H IN PTR ae0-404.cr2-pmtpa.wikimedia.org.
; LVS out-of-subnet IPs
@@ -97,7 +89,6 @@
; 208.80.152.224/27 sandbox vlan
225 1H IN PTR vrrp-gw-103.wikimedia.org.
226 1H IN PTR amaranth.toolserver.org.
-227 1H IN PTR ae0-103.cr1-sdtpa.wikimedia.org.
228 1H IN PTR ae0-103.cr2-pmtpa.wikimedia.org.
229 1H IN PTR ts-array4b.mgmt.toolserver.org.
230 1H IN PTR ts-array4a.mgmt.toolserver.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index e129b61..c141344 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -115,13 +115,13 @@
202 1H IN PTR cr1-eqiad.wikimedia.org.
203 1H IN PTR cr2-eqiad.wikimedia.org.
-; 208.80.154.208/30 (cr1-sdtpa <--> cr1-eqiad)
+; 208.80.154.208/30 (cr2-pmtpa <--> cr1-eqiad)
209 1H IN PTR xe-5-2-1.cr1-eqiad.wikimedia.org.
-210 1H IN PTR xe-0-0-1.cr1-sdtpa.wikimedia.org.
+210 1H IN PTR xe-0-0-0.cr2-pmtpa.wikimedia.org.
-; 208.80.154.212/30 (cr1-sdtpa <--> cr2-eqiad)
+; 208.80.154.212/30 (cr2-pmtpa <--> cr2-eqiad)
213 1H IN PTR xe-5-2-1.cr2-eqiad.wikimedia.org.
-214 1H IN PTR xe-1-1-0.cr1-sdtpa.wikimedia.org.
+214 1H IN PTR xe-1-1-0.cr2-pmtpa.wikimedia.org.
; 208.80.154.216/31 (cr1-eqiad <--> pfw1-eqiad)
216 1H IN PTR xe-5-0-3.cr1-eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 65d4ac9..ca658e9 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -342,9 +342,6 @@
cr1-esams 1H IN A 91.198.174.245
IN AAAA 2620:0:862:ffff::5
-cr1-sdtpa 1H IN A 208.80.152.196
- IN AAAA 2620:0:860:ffff::4
-
cr1-ulsfo 1H IN A 198.35.26.192
IN AAAA 2620:0:863:ffff::1
@@ -365,8 +362,6 @@
csw2-esams 1H IN A 91.198.174.244
1H IN AAAA 2620:0:862:ffff::3
-
-csw1-sdtpa 1H IN A 208.80.152.193
mr1-eqiad 1H IN A 208.80.154.201
mr1-pmtpa 1H IN A 216.87.189.242
diff --git a/templates/wmnet b/templates/wmnet
index a38a3ee..92226b5 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -97,7 +97,6 @@
asw-d2-pmtpa 1H IN A 10.1.1.23
asw-d3-pmtpa 1H IN A 10.1.1.24
-cr1-sdtpa 1H IN A 10.1.1.17
cr2-pmtpa 1H IN A 10.1.1.18
nas1-a 1H IN A 10.1.8.61
--
To view, visit https://gerrit.wikimedia.org/r/131347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a4fdcd8c2d58d5027e8244faa5843bc4ba65f98
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
