BBlack has submitted this change and it was merged.
Change subject: codfw: add datacenter to dns config
......................................................................
codfw: add datacenter to dns config
Adds a codfw datacenter to the geo config and adds relevant PTR
records and service records into the relevant files.
The IPs copy how eqiad have them laid out as it seems both datacenters
will aspire to host the same services so keeping the same IP endings
may be suitable. Also based on existing comments about range allocation.
This is just a basic addition which adds everything necessary to
allow codfw into the dns scheme and can be modified to suit any needs
now (or later).
Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
---
M config-geo
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/wikimedia.org
4 files changed, 27 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index a4e601d..2e3ced9 100644
--- a/config-geo
+++ b/config-geo
@@ -3,7 +3,7 @@
generic-map => {
geoip_db => /usr/share/GeoIP/GeoLiteCityv6.dat
geoip_db_v4_overlay => /usr/share/GeoIP/GeoIPCity.dat
- datacenters => [eqiad esams ulsfo]
+ datacenters => [eqiad esams ulsfo codfw]
map => {
# use ISO 3166-2 official names
AF => [esams, eqiad], # ESAMS-EQIAD
@@ -223,7 +223,7 @@
only-primary-map => {
geoip_db => /usr/share/GeoIP/GeoIPv6.dat
geoip_db_v4_overlay => /usr/share/GeoIP/GeoIP.dat
- datacenters => [eqiad esams ulsfo]
+ datacenters => [eqiad codfw esams ulsfo]
map => {
default => eqiad,
}
@@ -235,6 +235,7 @@
service_types => up
dcmap => {
eqiad => { addrs_v4 => 208.80.154.224, addrs_v6 =>
2620:0:861:ed1a::1 }
+ codfw => { addrs_v4 => 208.80.153.224, addrs_v6 =>
2620:8:860:ed1a::1 }
esams => { addrs_v4 => 91.198.174.192, addrs_v6 =>
2620:0:862:ed1a::1 }
ulsfo => { addrs_v4 => 198.35.26.96, addrs_v6 =>
2620:0:863:ed1a::1 }
}
@@ -244,6 +245,7 @@
service_types => up
dcmap => {
eqiad => 208.80.154.224
+ codfw => 208.80.153.224
esams => 91.198.174.192
ulsfo => 198.35.26.96
}
@@ -253,6 +255,7 @@
service_types => up
dcmap => {
eqiad => { addrs_v4 => 208.80.154.234, addrs_v6 =>
2620:0:861:ed1a::1:a }
+ codfw => { addrs_v4 => 208.80.153.234, addrs_v6 =>
2620:0:860:ed1a::1:a }
esams => { addrs_v4 => 91.198.174.202, addrs_v6 =>
2620:0:862:ed1a::1:a }
ulsfo => { addrs_v4 => 198.35.26.106, addrs_v6 =>
2620:0:863:ed1a::1:a }
}
@@ -262,6 +265,7 @@
service_types => up
dcmap => {
eqiad => 208.80.154.234
+ codfw => 208.80.153.234
esams => 91.198.174.202
ulsfo => 198.35.26.106
}
@@ -271,6 +275,7 @@
service_types => up
dcmap => {
eqiad => { addrs_v4 => 208.80.154.240, addrs_v6 =>
2620:0:861:ed1a::2:b }
+ codfw => { addrs_v4 => 208.80.153.240, addrs_v6 =>
2620:0:860:ed1a::2:b }
esams => { addrs_v4 => 91.198.174.208, addrs_v6 =>
2620:0:862:ed1a::2:b }
ulsfo => { addrs_v4 => 198.35.26.112, addrs_v6 =>
2620:0:863:ed1a::2:b }
}
@@ -280,6 +285,7 @@
service_types => up
dcmap => {
eqiad => { addrs_v4 => 208.80.154.236, addrs_v6 =>
2620:0:861:ed1a::1:c }
+ codfw => { addrs_v4 => 208.80.153.236, addrs_v6 =>
2620:0:860:ed1a::1:c }
esams => { addrs_v4 => 91.198.174.204, addrs_v6 =>
2620:0:862:ed1a::1:c }
ulsfo => { addrs_v4 => 198.35.26.108, addrs_v6 =>
2620:0:863:ed1a::1:c }
}
@@ -289,6 +295,7 @@
service_types => up
dcmap => {
eqiad => { addrs_v4 => 208.80.154.233, addrs_v6 =>
2620:0:861:ed1a::1:9 }
+ codfw => { addrs_v4 => 208.80.153.233, addrs_v6 =>
2620:0:860:ed1a::1:9 }
esams => { addrs_v4 => 91.198.174.201, addrs_v6 =>
2620:0:862:ed1a::1:9 }
ulsfo => { addrs_v4 => 198.35.26.105, addrs_v6 =>
2620:0:863:ed1a::1:9 }
}
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 7fd41e6..e23cade 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
@@ -139,16 +139,23 @@
$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.
e.0.0.0 1H IN PTR ns1.wikimedia.org.
; LVS Mobile Zero & general support, 2620:0:860:ed1a::1:0/112
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+9.0.0.0 1H IN PTR login-lb.codfw.wikimedia.org.
+a.0.0.0 1H IN PTR bits-lb.codfw.wikimedia.org.
+c.0.0.0 1H IN PTR mobile-lb.codfw.wikimedia.org.
+
; LVS Multimedia, 2620:0:860:ed1a::2:0/112
$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.
+
; LVS Misc, 2620:0:860:ed1a::3:0/112
$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 73685c0..84bc704 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -104,11 +104,16 @@
; LVS out-of-subnet service IPs (208.80.153.224/27)
; Desktop Text & Assets 208.80.153.224 - .231 (208.80.153.224/29)
+224 1H IN PTR text-lb.codfw.wikimedia.org.
231 1H IN PTR ns1.wikimedia.org.
; Mobile Zero & general Support 208.80.153.232 - .239 (208.80.153.232/29)
+233 1H IN PTR login-lb.codfw.wikimedia.org.
+234 1H IN PTR bits-lb.codfw.wikimedia.org.
+236 1H IN PTR mobile-lb.codfw.wikimedia.org.
; Multimedia 208.80.153.240 - .247 (208.80.153.240/29)
+240 1H IN PTR upload-lb.codfw.wikimedia.org.
; Misc 208.80.153.248 - .255 (208.80.153.248/29)
254 1H IN PTR dns-rec-lb.codfw.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3af1577..c1053d8 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -262,6 +262,12 @@
;;; codfw
dns-rec-lb.codfw 1H IN A 208.80.153.254
1H IN AAAA 2620:0:860:ed1a::3:fe
+text-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
+login-lb.codfw 600 IN DYNA geoip!login-addrs/codfw
+bits-lb.codfw 600 IN DYNA geoip!bits-addrs/codfw
+upload-lb.codfw 600 IN DYNA geoip!upload-addrs/codfw
+mobile-lb.codfw 600 IN DYNA geoip!mobile-addrs/codfw
+donate-lb.codfw 600 IN DYNA geoip!text-addrs-v4/codfw
; Mobile
--
To view, visit https://gerrit.wikimedia.org/r/203544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
Gerrit-PatchSet: 4
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis <johnflewi...@gmail.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Papaul <ptshiba...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
