Faidon Liambotis has submitted this change and it was merged. Change subject: Remove references to br1/2-ulsfo ......................................................................
Remove references to br1/2-ulsfo I assume this was a now-abandoned experiment with virtual routers. Remove A/AAAA/PTRs for both of them, and empty the cross-router subnets. Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6 --- M templates/26.35.198.in-addr.arpa M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa M templates/wikimedia.org 3 files changed, 2 insertions(+), 22 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa index 4504f38..d45c394 100644 --- a/templates/26.35.198.in-addr.arpa +++ b/templates/26.35.198.in-addr.arpa @@ -54,16 +54,12 @@ 192 1H IN PTR cr1-ulsfo.wikimedia.org. 193 1H IN PTR cr2-ulsfo.wikimedia.org. -194 1H IN PTR br1-ulsfo.wikimedia.org. -195 1H IN PTR br2-ulsfo.wikimedia.org. ; 198.35.26.196/31 196 1H IN PTR ae0-2.cr1-ulsfo.wikimedia.org. 197 1H IN PTR ae0-2.cr2-ulsfo.wikimedia.org. ; 198.35.26.198/31 -198 1H IN PTR ae0-3.br1-ulsfo.wikimedia.org. -199 1H IN PTR ae0-3.br2-ulsfo.wikimedia.org. ; 198.35.26.200/29 201 1H IN PTR cr1-ulsfo.wikimedia.org. @@ -71,9 +67,5 @@ 203 1H IN PTR mr1-ulsfo.wikimedia.org. ; 198.35.26.208/31 -208 1H IN PTR lt-0-0-0-0.cr1-ulsfo.wikimedia.org. -209 1H IN PTR lt-0-0-0-1.br1-ulsfo.wikimedia.org. ; 198.35.26.210/31 -210 1H IN PTR lt-0-0-0-0.cr2-ulsfo.wikimedia.org. -211 1H IN PTR lt-0-0-0-1.br2-ulsfo.wikimedia.org. diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa index 8593b4d..13c44cc 100644 --- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa +++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa @@ -68,17 +68,13 @@ 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR xe-5-2-2.cr2-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-3-538.cr1-ulsfo.wikimedia.org. -; cr1-ulsfo <--> br1-ulsfo (2620:0:863:fe02::/64) +; empty (2620:0:863: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 lt0-0.cr1-ulsfo.wikimedia.org. -2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br1-ulsfo.wikimedia.org. -; cr2-ulsfo <--> br2-ulsfo (2620:0:863:fe03::/64) +; empty (2620:0:863: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 lt0-0.cr2-ulsfo.wikimedia.org. -2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br2-ulsfo.wikimedia.org. ; cr2-ulsfo <--> cr1-eqiad (2620:0:863:fe04::/64) @@ -91,8 +87,6 @@ 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org. 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-ulsfo.wikimedia.org. -3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br1-ulsfo.wikimedia.org. -4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br2-ulsfo.wikimedia.org. ; LVS Service IPs, 2620:0:863:ed1a::/64 diff --git a/templates/wikimedia.org b/templates/wikimedia.org index 6e02d97..5f29d9a 100644 --- a/templates/wikimedia.org +++ b/templates/wikimedia.org @@ -375,12 +375,6 @@ ; Networking -br1-ulsfo 1H IN A 198.35.26.194 - IN AAAA 2620:0:863:ffff::3 - -br2-ulsfo 1H IN A 198.35.26.195 - IN AAAA 2620:0:863:ffff::4 - cr1-eqiad 1H IN A 208.80.154.196 IN AAAA 2620:0:861:ffff::1 -- To view, visit https://gerrit.wikimedia.org/r/110149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib05ba20e3eb7a7101d2e58ad0d5798dbc4a716e6 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: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits