BBlack has submitted this change and it was merged.
Change subject: revdns: document LVS traffic classes
......................................................................
revdns: document LVS traffic classes
Bug: T143915
Change-Id: I6b7676459f32d068455ae758a35504944ce90a96
---
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/153.80.208.in-addr.arpa
M templates/154.80.208.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/26.35.198.in-addr.arpa
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
9 files changed, 21 insertions(+), 71 deletions(-)
Approvals:
BBlack: 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 30bac26..1470b45 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
@@ -177,9 +177,8 @@
; 2620:0:860:ed1a::0:0/110 (::0:0 - ::3:ffff) LVS Service IPs
-; - 2620:0:860:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS Text
+; - 2620:0:860:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS high-traffic1 (Text)
-; - - 2620:0:860:ed1a::0:0/112 (::0:0 - ::0:ffff) LVS Desktop
$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
1.0.0.0 1H IN PTR text-lb.codfw.wikimedia.org.
@@ -187,23 +186,19 @@
; wrong subnet, but unimportant...
e.0.0.0 1H IN PTR ns1.wikimedia.org.
-; - - 2620:0:860:ed1a::1:0/112 (::1:0 - ::1:ffff) LVS Mobile
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
-; - 2620:0:860:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS Multimedia & Misc
+; - 2620:0:860:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS high-traffic2 (Multimedia
& Misc)
-; - - 2620:0:860:ed1a::2:0/112 (::2:0 - ::2:ffff) LVS Multimedia
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.codfw.wikimedia.org.
d.0.0.0 1H IN PTR maps-lb.codfw.wikimedia.org.
-; - - 2620:0:860:ed1a::3:0/112 (::3:0 - ::3:ffff) LVS Misc
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
d.0.0.0 1H IN PTR misc-web-lb.codfw.wikimedia.org.
e.f.0.0 1H IN PTR dns-rec-lb.codfw.wikimedia.org.
-
; Neighbor blocks
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 2e241dd..ead7b37 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
@@ -217,9 +217,8 @@
; 2620:0:861:ed1a::0:0/110 (::0:0 - ::3:ffff) LVS Service IPs
-; - 2620:0:861:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS Text
+; - 2620:0:861:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS high-traffic1 (Text)
-; - - 2620:0:861:ed1a::0:0/112 (::0:0 - ::0:ffff) LVS Desktop
$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
1.0.0.0 1H IN PTR text-lb.eqiad.wikimedia.org.
@@ -227,24 +226,20 @@
; wrong subnet, but not important...
e.0.0.0 1H IN PTR ns0.wikimedia.org.
-; - - 2620:0:861:ed1a::1:0/112 (::1:0 - ::1:ffff) LVS Mobile
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
-; - 2620:0:861:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS Multimedia & Misc
+; - 2620:0:861:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS high-traffic2 (Multimedia
& Misc)
-; - - 2620:0:861:ed1a::2:0/112 (::2:0 - ::2:ffff) LVS Multimedia
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.eqiad.wikimedia.org.
d.0.0.0 1H IN PTR maps-lb.eqiad.wikimedia.org.
-; - - 2620:0:861:ed1a::3:0/112 (::3:0 - ::3:ffff) LVS Misc
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
d.0.0.0 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
6.1.0.0 1H IN PTR git-ssh.eqiad.wikimedia.org.
e.f.0.0 1H IN PTR dns-rec-lb.eqiad.wikimedia.org.
-
; Neighbor blocks
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 54e1567..60600c0 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -13,7 +13,7 @@
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-; codfw svc ips
+; 10.2.1.0/24 - codfw LVS low-traffic (internal) services
$ORIGIN 1.2.{{ zonename }}.
1 1H IN PTR appservers.svc.codfw.wmnet.
@@ -41,7 +41,7 @@
32 1H IN PTR wdqs.svc.codfw.wmnet.
; 33 reserved for kibana
-; eqiad svc ips
+; 10.2.2.0/24 - eqiad LVS low-traffic (internal) services
$ORIGIN 2.2.{{ zonename }}.
@@ -72,11 +72,11 @@
32 1H IN PTR wdqs.svc.eqiad.wmnet.
33 1H IN PTR kibana.svc.eqiad.wmnet.
-; esams svc ips
+; 10.2.3.0/24 - esams LVS low-traffic (internal) services
$ORIGIN 3.2.{{ zonename }}.
-; ulsfo svc ips
+; 10.2.4.0/24 - ulsfo LVS low-traffic (internal) services
$ORIGIN 4.2.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa
b/templates/153.80.208.in-addr.arpa
index ef0257f..1f623db 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -131,26 +131,18 @@
; 208.80.153.224/27 (224-255) LVS Service IPs
-; - 208.80.153.224/28 (224-239) LVS Text
-
-; - - 208.80.153.224/29 (224-231) LVS Desktop
+; - 208.80.153.224/28 (224-239) LVS high-traffic1 (Text)
224 1H IN PTR text-lb.codfw.wikimedia.org.
; wrong subnet, but not important...
231 1H IN PTR ns1.wikimedia.org.
-; - - 208.80.153.232/29 (232-239) LVS Mobile
-
-; - 208.80.153.240/28 (240-255) LVS Multimedia & Misc
-
-; - - 208.80.153.240/29 (240-247) LVS Multimedia
+; - 208.80.153.240/28 (240-255) LVS high-traffic2 (Multimedia & Misc)
240 1H IN PTR upload-lb.codfw.wikimedia.org.
244 1H IN PTR maps-lb.codfw.wikimedia.org.
-
-; - - 208.80.153.248/29 (248-255) LVS Misc
248 1H IN PTR misc-web-lb.codfw.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index b5631b6..0a1a1e3 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -157,26 +157,18 @@
; 208.80.154.224/27 (224-255) LVS Service IPs
-; - 208.80.154.224/28 (224-239) LVS Text
-
-; - - 208.80.154.224/29 (224-231) LVS Desktop
+; - 208.80.154.224/28 (224-239) LVS high-traffic1 (Text)
224 1H IN PTR text-lb.eqiad.wikimedia.org.
-; - - 208.80.154.232/29 (232-239) LVS Mobile
-
-; these two are in the wrong subnet, but not important...
+; wrong subnet? but not important...
238 1H IN PTR ns0.wikimedia.org.
-; - 208.80.154.240/28 (240-255) LVS Multimedia & Misc
-
-; - - 208.80.154.240/29 (240-247) LVS Multimedia
+; - 208.80.154.240/28 (240-255) LVS high-traffic2 (Multimedia & Misc)
240 1H IN PTR upload-lb.eqiad.wikimedia.org.
244 1H IN PTR maps-lb.eqiad.wikimedia.org.
-
-; - - 208.80.154.248/29 (248-255) LVS Misc
250 1H IN PTR git-ssh.eqiad.wikimedia.org.
251 1H IN PTR misc-web-lb.eqiad.wikimedia.org.
diff --git a/templates/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index f6872cc..cecabe3 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -38,22 +38,14 @@
; 91.198.174.192/27 (192-223) LVS Service IPs
-; - 91.198.174.192/28 (192-207) LVS Text
-
-; - - 91.198.174.192/29 (192-199) LVS Desktop
+; - 91.198.174.192/28 (192-207) LVS high-traffic1 (Text)
192 1H IN PTR text-lb.esams.wikimedia.org.
-; - - 91.198.174.200/29 (200-207) LVS Mobile
-
-; - 91.198.174.208/28 (208-223) LVS Multimedia & Misc
-
-; - - 91.198.174.208/29 (208-215) LVS Multimedia
+; - 91.198.174.208/28 (208-223) LVS high-traffic2 (Multimedia & Misc)
208 1H IN PTR upload-lb.esams.wikimedia.org.
209 1H IN PTR maps-lb.esams.wikimedia.org.
-
-; - - 91.198.174.216/29 (216-223) LVS Misc
216 1H IN PTR dns-rec-lb.esams.wikimedia.org. ; not actually public!
217 1H IN PTR misc-web-lb.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 3b6daef..7d1d13e 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
@@ -92,9 +92,8 @@
; 2620:0:862:ed1a::0:0/110 (::0:0 - ::3:ffff) LVS Service IPs
-; - 2620:0:862:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS Text
+; - 2620:0:862:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS high-traffic1 (Text)
-; - - 2620:0:862:ed1a::0:0/112 (::0:0 - ::0:ffff) LVS Desktop
$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
1.0.0.0 1H IN PTR text-lb.esams.wikimedia.org.
@@ -102,18 +101,15 @@
; wrong subnet, but unimportant...
e.0.0.0 1H IN PTR ns2.wikimedia.org.
-; - - 2620:0:862:ed1a::1:0/112 (::1:0 - ::1:ffff) LVS Mobile
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
-; - 2620:0:862:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS Multimedia & Misc
+; - 2620:0:862:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS high-traffic2 Multimedia &
Misc
-; - - 2620:0:862:ed1a::2:0/112 (::2:0 - ::2:ffff) LVS Multimedia
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.esams.wikimedia.org.
d.0.0.0 1H IN PTR maps-lb.esams.wikimedia.org.
-; - - 2620:0:862:ed1a::3:0/112 (::3:0 - ::3:ffff) LVS Misc
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
d.0.0.0 1H IN PTR misc-web-lb.esams.wikimedia.org.
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 0169668..7c9a2d7 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -26,22 +26,14 @@
; 198.35.26.96/27 (96-127) LVS Service IPs
-; - 198.35.26.96/28 (96-111) LVS Text
-
-; - - 198.35.26.96/29 (96-103) LVS Desktop
+; - 198.35.26.96/28 (96-111) LVS high-traffic1 (Text)
96 1H IN PTR text-lb.ulsfo.wikimedia.org.
-; - - 198.35.26.104/29 (104-111) LVS Mobile
-
-; - 198.35.26.112/28 (112-127) LVS Multimedia & Misc
-
-; - - 198.35.26.112/29 (112-119) LVS Multimedia
+; - 198.35.26.112/28 (112-127) LVS high-traffic2 (Multimedia & Misc)
112 1H IN PTR upload-lb.ulsfo.wikimedia.org.
113 1H IN PTR maps-lb.ulsfo.wikimedia.org.
-
-; - - 198.35.26.120/29 (120-127) LVS Misc
120 1H IN PTR misc-web-lb.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 1811d0b..d024c03 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
@@ -118,25 +118,21 @@
; 2620:0:863:ed1a::0:0/110 (::0:0 - ::3:ffff) LVS Service IPs
-; - 2620:0:863:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS Text
+; - 2620:0:863:ed1a::0:0/111 (::0:0 - ::1:ffff) LVS high-traffic1 (Text)
-; - - 2620:0:863:ed1a::0:0/112 (::0:0 - ::0:ffff) LVS Desktop
$ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
1.0.0.0 1H IN PTR text-lb.ulsfo.wikimedia.org.
-; - - 2620:0:863:ed1a::1:0/112 (::1:0 - ::1:ffff) LVS Mobile
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
-; - 2620:0:863:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS Multimedia & Misc
+; - 2620:0:863:ed1a::2:0/111 (::2:0 - ::3:ffff) LVS high-traffic2 (Multimedia
& Misc)
-; - - 2620:0:863:ed1a::2:0/112 (::2:0 - ::2:ffff) LVS Multimedia
$ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
b.0.0.0 1H IN PTR upload-lb.ulsfo.wikimedia.org.
d.0.0.0 1H IN PTR maps-lb.ulsfo.wikimedia.org.
-; - - 2620:0:863:ed1a::3:0/112 (::3:0 - ::3:ffff) LVS Misc
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
d.0.0.0 1H IN PTR misc-web-lb.ulsfo.wikimedia.org.
--
To view, visit https://gerrit.wikimedia.org/r/318081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b7676459f32d068455ae758a35504944ce90a96
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
