Faidon Liambotis has submitted this change and it was merged.

Change subject: Kill toolserver IPv4/IPv6 subnets
......................................................................


Kill toolserver IPv4/IPv6 subnets

Change-Id: I2edcb8355413f19cd631594212cff0c2d675408f
---
M templates/0.8.c.e.2.0.a.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/59.15.185.in-addr.arpa
4 files changed, 0 insertions(+), 43 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, but someone else must approve
  Faidon Liambotis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/0.8.c.e.2.0.a.2.ip6.arpa 
b/templates/0.8.c.e.2.0.a.2.ip6.arpa
index 7d5db5e..ccdb3f1 100644
--- a/templates/0.8.c.e.2.0.a.2.ip6.arpa
+++ b/templates/0.8.c.e.2.0.a.2.ip6.arpa
@@ -15,14 +15,6 @@
                         1D      IN NS   ns1.wikimedia.org.
                         1D      IN NS   ns2.wikimedia.org.
 
-; Toolserver (2a02:ec80:101::/48)
-
-$ORIGIN 1.0.1.0.{{ zonename }}.
-
-@   1H IN NS    a.ns.toolserver.org.
-@   1H IN NS    b.ns.toolserver.org.
-@   1H IN NS    c.ns.toolserver.org.
-
 ;  OOB Tilaa transit subnet (2a02:ec80:500:1::/64)
 
 $ORIGIN 1.0.0.0.0.0.5.0.{{ zonename }}.
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 4e151d0..14dc242 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -284,17 +284,6 @@
 249 1H  IN PTR  msw-oe12-esams.mgmt.esams.wmnet.
 253 1H  IN PTR  schleifenbauer.mgmt.esams.wmnet.
 
-$ORIGIN {{ zonename }}.
-; Toolserver management
-0.23    1H  IN NS   a.ns.toolserver.org.
-    1H  IN NS   b.ns.toolserver.org.
-    1H  IN NS   c.ns.toolserver.org.
-
-; Toolserver internal
-1.24    1H  IN NS   a.ns.toolserver.org.
-    1H  IN NS   b.ns.toolserver.org.
-    1H  IN NS   c.ns.toolserver.org.
-
 ;
 ; EQIAD (10.64.0.0/12)
 ;
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 a8252cb..d480a4e 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
@@ -122,21 +122,6 @@
 3.8.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3048.esams.wmnet.
 4.8.1.0.0.0.0.0.0.2.0.0.0.1.0.0 1H IN PTR   cp3049.esams.wmnet.
 
-; Toolserver external subnet 2620:0:862:101::/64
-
-$ORIGIN 1.0.1.0.{{ zonename }}.
-
-@   1H IN NS    a.ns.toolserver.org.
-@   1H IN NS    b.ns.toolserver.org.
-@   1H IN NS    c.ns.toolserver.org.
-
-; Toolserver internal subnet 2620:0:862:301::/64
-
-$ORIGIN 1.0.3.0.{{ zonename }}.
-
-@   1H IN NS    a.ns.toolserver.org.
-@   1H IN NS    b.ns.toolserver.org.
-@   1H IN NS    c.ns.toolserver.org.
 
 ; LVS Service IPs, 2620:0:862:ed1a::/64
 
diff --git a/templates/59.15.185.in-addr.arpa b/templates/59.15.185.in-addr.arpa
index 3e5c4a5..c86aa34 100644
--- a/templates/59.15.185.in-addr.arpa
+++ b/templates/59.15.185.in-addr.arpa
@@ -15,15 +15,6 @@
         1D IN NS   ns1.wikimedia.org.
         1D IN NS   ns2.wikimedia.org.
 
-; Toolserver subnet: 185.15.59.192/27 (185.15.59.192 - 185.15.59.223)
-
-192-223 1H IN NS    a.ns.toolserver.org.
-        1H IN NS    b.ns.toolserver.org.
-        1H IN NS    c.ns.toolserver.org.
-{% for i in range(192, 224) %}
-{{ i }} 1H IN CNAME {{ i }}.192-223.59.15.185.in-addr.arpa.
-{%- endfor %}
-
 ; Neighbor blocks: 185.15.59.244/29
 
 ; cr1-esams <--> mr1-esams: 185.15.59.244/31

-- 
To view, visit https://gerrit.wikimedia.org/r/199288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2edcb8355413f19cd631594212cff0c2d675408f
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to