BBlack has submitted this change and it was merged.
Change subject: maps DNS 1/2: define at all DCs
......................................................................
maps DNS 1/2: define at all DCs
Note this is "safe" and doesn't change anything for maps.wm.o yet.
Followup dependent commit configures geoip and removes all the XXX
Bug: T109162
Change-Id: I77736ef613d9396ecdb3030b8be790029d09c220
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.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
M templates/wikimedia.org
7 files changed, 22 insertions(+), 4 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 01f6931..bc22a6b 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
@@ -195,6 +195,7 @@
$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 }}.
diff --git a/templates/153.80.208.in-addr.arpa
b/templates/153.80.208.in-addr.arpa
index 1a026ef..76a680a 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -151,6 +151,8 @@
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/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index 0cdbe83..7582b72 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -57,6 +57,7 @@
; - - 91.198.174.208/29 (208-215) LVS Multimedia
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
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 05d5d74..e22d8df 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
@@ -115,6 +115,7 @@
$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 }}.
diff --git a/templates/26.35.198.in-addr.arpa b/templates/26.35.198.in-addr.arpa
index 433c3be..d595fab 100644
--- a/templates/26.35.198.in-addr.arpa
+++ b/templates/26.35.198.in-addr.arpa
@@ -44,6 +44,7 @@
; - - 198.35.26.112/29 (112-119) LVS Multimedia
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
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 b8564d1..1cd1742 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
@@ -140,6 +140,7 @@
$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 }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index f22ebb6..34f9409 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -78,6 +78,9 @@
text-lb 600 DYNA geoip!text-addrs
bits 600 DYNA geoip!text-addrs
upload 600 DYNA geoip!upload-addrs
+; XXX temporary, should be DYNA geoip!maps-addrs
+maps 1H IN A 208.80.154.244
+ 1H IN AAAA 2620:0:861:ed1a::2:d
m 600 DYNA geoip!mobile-addrs
misc-web-lb 600 DYNA geoip!misc-addrs
geoiplookup 600 DYNA geoip!geoiplookup-addrs
@@ -203,6 +206,9 @@
text-lb.eqiad 600 IN DYNA geoip!text-addrs/eqiad
upload-lb.eqiad 600 IN DYNA geoip!upload-addrs/eqiad
mobile-lb.eqiad 600 IN DYNA geoip!mobile-addrs/eqiad
+; XXX temporary, should be DYNA geoip!maps-addrs/eqiad
+maps-lb.eqiad 1H IN A 208.80.154.244
+ 1H IN AAAA 2620:0:861:ed1a::2:d
misc-web-lb.eqiad 600 IN DYNA geoip!misc-addrs/eqiad
donate-lb.eqiad 600 IN DYNA geoip!text-addrs/eqiad
IN MX 10 mx1001.wikimedia.org.
@@ -210,10 +216,6 @@
;;; ns0 208.80.154.238
dns-rec-lb.eqiad 1H IN A 208.80.154.239
1H IN AAAA 2620:0:861:ed1a::3:fe
-maps-lb.eqiad 1H IN A 208.80.154.244
- 1H IN AAAA 2620:0:861:ed1a::2:d
-maps 1H IN A 208.80.154.244
- 1H IN AAAA 2620:0:861:ed1a::2:d
geoiplookup-lb.eqiad 600 IN DYNA geoip!geoiplookup-addrs/eqiad
@@ -240,6 +242,9 @@
text-lb.ulsfo 600 IN DYNA geoip!text-addrs/ulsfo
upload-lb.ulsfo 600 IN DYNA geoip!upload-addrs/ulsfo
mobile-lb.ulsfo 600 IN DYNA geoip!mobile-addrs/ulsfo
+; XXX temporary, should be DYNA geoip!maps-addrs/ulsfo
+maps-lb.ulsfo 1H IN A 198.35.26.113
+ 1H IN AAAA 2620:0:863:ed1a::2:d
misc-web-lb.ulsfo 600 IN DYNA geoip!misc-addrs/ulsfo
geoiplookup-lb.ulsfo 600 IN DYNA geoip!geoiplookup-addrs/ulsfo
donate-lb.ulsfo 600 IN DYNA geoip!text-addrs/ulsfo
@@ -252,6 +257,9 @@
text-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
upload-lb.codfw 600 IN DYNA geoip!upload-addrs/codfw
mobile-lb.codfw 600 IN DYNA geoip!mobile-addrs/codfw
+; XXX temporary, should be DYNA geoip!maps-addrs/codfw
+maps-lb.codfw 1H IN A 208.80.153.244
+ 1H IN AAAA 2620:0:860:ed1a::2:d
misc-web-lb.codfw 600 IN DYNA geoip!misc-addrs/codfw
donate-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
geoiplookup-lb.codfw 600 IN DYNA geoip!geoiplookup-addrs/codfw
@@ -775,6 +783,9 @@
text-lb 600 IN DYNA geoip!text-addrs/esams
upload-lb 600 IN DYNA geoip!upload-addrs/esams
mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
+; XXX temporary, should be DYNA geoip!maps-addrs/esams
+maps-lb 1H IN A 91.198.174.209
+ 1H IN AAAA 2620:0:862:ed1a::2:d
misc-web-lb 600 IN DYNA geoip!misc-addrs/esams
geoiplookup-lb 600 IN DYNA geoip!geoiplookup-addrs/esams
donate-lb 600 IN DYNA geoip!text-addrs/esams
--
To view, visit https://gerrit.wikimedia.org/r/268239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77736ef613d9396ecdb3030b8be790029d09c220
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
