Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171265
Change subject: Kill all (outdated) references to pmtpa
......................................................................
Kill all (outdated) references to pmtpa
Change-Id: I1ca1a156396ab6c244c5bf86e1488a15a38b9309
---
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, 2 insertions(+), 225 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/65/171265/1
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 6ec1775..4610062 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
@@ -160,6 +160,3 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-codfw.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-codfw.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.
-
-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 f5668ae..9a440e6 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
@@ -257,17 +257,9 @@
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 <--> cr2-pmtpa (2620:0:861:fe01::/64)
+; unassigned (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-0.cr2-pmtpa.wikimedia.org.
-
-; 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.cr2-pmtpa.wikimedia.org.
+; unassigned (2620:0:861:fe02::/64)
; 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 3834f0c..65222ee 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -14,90 +14,6 @@
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-; 10.0.0.0/12 - pmtpa
-
-; 10.0.0.0/16 - pmtpa private vlan
-
-; Servers
-
-$ORIGIN 0.0.{{ zonename }}.
-
-200 1H IN PTR vrrp-gw-2.pmtpa.wmnet.
-202 1H IN PTR ae0-2.cr2-pmtpa.wikimedia.org.
-
-; asw* DEPRECATED, put in management network
-$ORIGIN 1.0.{{ zonename }}.
-
-{% for i in range(1, 10) %}
-{{ i }} 1H IN PTR asw{{ i }}-pmtpa.pmtpa.wmnet.
-{%- endfor %}
-
-; srv*
-
-$ORIGIN 2.0.{{ zonename }}.
-
-$ORIGIN 3.0.{{ zonename }}.
-
-; Service IPs
-
-$ORIGIN 5.0.{{ zonename }}.
-
-6 1H IN PTR dns-r0.pmtpa.wmnet.
-7 1H IN PTR dns-r1.pmtpa.wmnet.
-8 1H IN PTR nfs-home.pmtpa.wmnet.
-
-; Databases
-
-$ORIGIN 6.0.{{ zonename }}.
-
-; Management (pmtpa)
-
-$ORIGIN 1.{{ zonename }}.
-
-; Network equipment
-
-$ORIGIN 1.1.{{ zonename }}.
-
-3 1H IN PTR asw-c3-pmtpa.mgmt.pmtpa.wmnet.
-4 1H IN PTR asw-c4-pmtpa.mgmt.pmtpa.wmnet.
-7 1H IN PTR asw-a2-pmtpa.mgmt.pmtpa.wmnet.
-15 1H IN PTR msw1-pmtpa.mgmt.pmtpa.wmnet.
-18 1H IN PTR cr2-pmtpa.mgmt.pmtpa.wmnet.
-
-21 1H IN PTR asw-d-pmtpa.mgmt.pmtpa.wmnet.
-22 1H IN PTR asw-d1-pmtpa.mgmt.pmtpa.wmnet.
-23 1H IN PTR asw-d2-pmtpa.mgmt.pmtpa.wmnet.
-24 1H IN PTR asw-d3-pmtpa.mgmt.pmtpa.wmnet.
-25 1H IN PTR msw2-pmtpa.mgmt.pmtpa.wmnet.
-
-; Supportive management infrastructure
-
-$ORIGIN 2.1.{{ zonename }}.
-
-2 1H IN PTR scs-d1-pmtpa.mgmt.pmtpa.wmnet.
-3 1H IN PTR mr1-pmtpa.mgmt.pmtpa.wmnet.
-
-$ORIGIN 3.1.{{ zonename }}.
-
-; Search Servers
-$ORIGIN 4.1.{{ zonename }}.
-
-; Power Distribution Units
-
-$ORIGIN 5.1.{{ zonename }}.
-
-; Database Servers
-$ORIGIN 6.1.{{ zonename }}.
-
-; Media Servers & SSL Servers & ES Servers & Memcached Servers
-$ORIGIN 7.1.{{ zonename }}.
-
-; Misc. Services Server Project
-$ORIGIN 8.1.{{ zonename }}.
-
-; Apaches pool (srv251+)
-$ORIGIN 9.1.{{ zonename }}.
-
; codfw svc ips
$ORIGIN 1.2.{{ zonename }}.
@@ -149,39 +65,6 @@
24 1H IN PTR upload.svc.ulsfo.wmnet.
25 1H IN PTR text.svc.ulsfo.wmnet.
26 1H IN PTR mobile.svc.ulsfo.wmnet.
-
-; labs svc ips
-
-$ORIGIN 128.2.{{ zonename }}.
-
-; Various small assignments
-
-$ORIGIN 0.3.{{ zonename }}.
-
-; Cross link between cr2-pmtpa and mr1-pmtpa: 10.3.0.8/30
-
-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.
-
-; 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.
-
-; Virtualization subnets
-
-; 10.4.0.0/21 - guest VMs subnet
-$ORIGIN {{ zonename }}.
-
-; 10.4.16.0/24 - VM host compute nodes subnet
-$ORIGIN 16.4.{{ zonename }}.
-
-1 1H IN PTR vrrp-gw-105.wikimedia.org.
-
-253 1H IN PTR ae0-105.cr2-pmtpa.wikimedia.org.
;
; ESAMS
diff --git a/templates/152.80.208.in-addr.arpa
b/templates/152.80.208.in-addr.arpa
index 918de16..0186726 100644
--- a/templates/152.80.208.in-addr.arpa
+++ b/templates/152.80.208.in-addr.arpa
@@ -14,31 +14,6 @@
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-; Public subnet 208.80.152.0/25 (208.80.152.0 - 208.80.152.127)
-; was Squids/LVS subnet
-
-
-; Public services subnet 208.80.152.128/26 (208.80.152.128 - 208.80.152.191)
-
-133 1H IN PTR wiki-mail.wikimedia.org.
-
-; Neighbor blocks, loopback IPs 208.80.152.192/27 (208.80.152.192 -
208.80.152.223)
-
-197 1H IN PTR cr2-pmtpa.wikimedia.org.
-
-; LVS out-of-subnet IPs
-
-; 208.80.152.224/27 sandbox vlan
-226 1H IN PTR amaranth.toolserver.org.
-229 1H IN PTR ts-array4b.mgmt.toolserver.org.
-230 1H IN PTR ts-array4a.mgmt.toolserver.org.
-
-234 1H IN PTR web.amaranth.toolserver.org.
-
-; FIXME FIXME FIXME
-; TEMP OVERLAP ALLOCATION, do not use yet until Tampa shutdown
-; FIXME FIXME FIXME
-
; 208.80.152.240/28 sandbox1-a-codfw (208.80.152.240 - 208.80.152.255)
241 1H IN PTR vrrp-gw-2201.wikimedia.org.
242 1H IN PTR ae1-2201.cr1-codfw.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index 9378f7c..eee74c9 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -127,14 +127,6 @@
202 1H IN PTR cr1-eqiad.wikimedia.org.
203 1H IN PTR cr2-eqiad.wikimedia.org.
-; 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-0.cr2-pmtpa.wikimedia.org.
-
-; 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.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.
217 1H IN PTR xe-6-0-0.pfw1-eqiad.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e91aaf4..faac4c2 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -313,9 +313,6 @@
cr2-knams 1H IN A 91.198.174.246
IN AAAA 2620:0:862:ffff::4
-cr2-pmtpa 1H IN A 208.80.152.197
- IN AAAA 2620:0:860:ffff::5
-
cr2-ulsfo 1H IN A 198.35.26.193
IN AAAA 2620:0:863:ffff::2
@@ -326,7 +323,6 @@
1H IN AAAA 2620:0:862:ffff::3
mr1-eqiad 1H IN A 208.80.154.201
-mr1-pmtpa 1H IN A 216.87.189.242
mr1-esams 1H IN A 91.198.174.247
1H IN AAAA 2620:0:862:ffff::1
@@ -381,14 +377,6 @@
pfw2-eqiad 1H IN A 208.80.154.219
mr1-ulsfo.oob.wikimedia.org. 1H IN A 209.237.234.242
-; Access switches
-
-asw-c3-pmtpa 1H IN A 10.1.1.3
-asw-c4-pmtpa 1H IN A 10.1.1.4
-asw-b1-pmtpa 1H IN A 10.1.1.5
-asw-b2-pmtpa 1H IN A 10.1.1.6
-asw-a2-pmtpa 1H IN A 10.1.1.7
-asw-b4-pmtpa 1H IN A 10.1.1.8
; Cams
diff --git a/templates/wmnet b/templates/wmnet
index 1c479cd..985b425 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -17,56 +17,6 @@
fundraisingdb-write 5M IN CNAME db1025.frack.eqiad.wmnet.
fundraisingdb-read 5M IN CNAME db1008.frack.eqiad.wmnet.
-$ORIGIN pmtpa.{{ zonename }}.
-
-{% for i in range(1, 10) %}
-asw{{ i }}-pmtpa 1H IN A 10.0.1.{{ i }}
-{%- endfor %}
-
-; Service aliases
-
-mirror 1H IN CNAME apt.wikimedia.org.
-webproxy 1H IN CNAME carbon.wikimedia.org.
-carbon-relay 1H IN CNAME tungsten.eqiad.wmnet.
-statsd 1H IN CNAME tungsten.eqiad.wmnet.
-eventlogging 1H IN CNAME vanadium.eqiad.wmnet.
-
-dns-r0 1H IN A 10.0.5.6
-dns-r1 1H IN A 10.0.5.7
-nfs-home 1H IN A 10.0.5.8
-config-master 1H IN CNAME palladium.eqiad.wmnet.
-puppet 1H IN CNAME palladium.eqiad.wmnet.
-syslog 1H IN CNAME lithium.eqiad.wmnet.
-
-; GENERATES
-
-; Network equipment etc.
-
-vl-2-0 1H IN A 10.0.0.200
-
-; pmtpa management network
-
-$ORIGIN mgmt.pmtpa.{{ zonename }}.
-
-scs-d1-pmtpa 1H IN A 10.1.2.2
-mr1-pmtpa 1H IN A 10.1.2.3
-msw1-pmtpa 1H IN A 10.1.1.15
-msw2-pmtpa 1H IN A 10.1.1.25
-
-asw-c3-pmtpa 1H IN A 10.1.1.3
-asw-c4-pmtpa 1H IN A 10.1.1.4
-asw-a2-pmtpa 1H IN A 10.1.1.7
-asw-d-pmtpa 1H IN A 10.1.1.21
-asw-d1-pmtpa 1H IN A 10.1.1.22
-asw-d2-pmtpa 1H IN A 10.1.1.23
-asw-d3-pmtpa 1H IN A 10.1.1.24
-
-cr2-pmtpa 1H IN A 10.1.1.18
-
-; SERVERS LISTED ALPHABETICALLY
-
-; GENERATES FOR MANGEMENT
-
;
; EQIAD
;
--
To view, visit https://gerrit.wikimedia.org/r/171265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ca1a156396ab6c244c5bf86e1488a15a38b9309
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
