BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209174
Change subject: move geoiplookup to text-addrs-v4
......................................................................
move geoiplookup to text-addrs-v4
Also eliminates bits-addrs-v4, as this was the only consumer of
it, and removes bits-related examples from admin_state commentary
Do not merge before cache support for this move is fully deployed!
Change-Id: Ia95d1b550206297b3f78f736230b308d9b71d5a0
---
M admin_state
M config-geo
M templates/wikimedia.org
3 files changed, 13 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/74/209174/1
diff --git a/admin_state b/admin_state
index 6ce67fb..7295eeb 100644
--- a/admin_state
+++ b/admin_state
@@ -53,19 +53,19 @@
# geoip/text*/esams => DOWN
# geoip/mobile-addrs/esams => DOWN
#
-# # Disable all services except bits-addrs + bits-addrs-v4 in ulsfo,
+# # Disable all services except text-addrs + text-addrs-v4 in ulsfo,
# # regardless of the order of these lines:
# geoip/generic-map/ulsfo => DOWN
-# geoip/bits-*/ulsfo => UP
+# geoip/text-*/ulsfo => UP
#
-# # Disable all services except bits-addrs in ulsfo:
+# # Disable all services except text-addrs in ulsfo:
# geoip/generic-map/ulsfo => DOWN
-# geoip/bits-*/ulsfo => UP # marks both bits UP as prev example, but...
-# geoip/bits-addrs-v4/ulsfo => DOWN # this overrides the above for -v4
+# geoip/text-*/ulsfo => UP # marks both text UP as prev example, but...
+# geoip/text-addrs-v4/ulsfo => DOWN # this overrides the above for -v4
#
-# # Disables all services except bits-addrs + bits-addrs-v4 in ulsfo:
+# # Disables all services except text-addrs + text-addrs-v4 in ulsfo:
# geoip/generic-map/ulsfo => DOWN
-# geoip/bits-addrs-v4/ulsfo => DOWN # this does nothing because...
-# geoip/bits-*/ulsfo => UP # ... this overrides the line above completely
+# geoip/text-addrs-v4/ulsfo => DOWN # this does nothing because...
+# geoip/text-*/ulsfo => UP # ... this overrides the line above completely
#
##############################################################################
diff --git a/config-geo b/config-geo
index 2e3ced9..63a89dc 100644
--- a/config-geo
+++ b/config-geo
@@ -240,7 +240,7 @@
ulsfo => { addrs_v4 => 198.35.26.96, addrs_v6 =>
2620:0:863:ed1a::1 }
}
}
- text-addrs-v4 => { # v4 from above, for e.g. donate
+ text-addrs-v4 => { # v4 from above, for e.g. donate and geoiplookup
map => generic-map
service_types => up
dcmap => {
@@ -258,16 +258,6 @@
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 }
- }
- }
- bits-addrs-v4 => { # v4 from above, for e.g. geoiplookup
- map => generic-map
- service_types => up
- dcmap => {
- eqiad => 208.80.154.234
- codfw => 208.80.153.234
- esams => 91.198.174.202
- ulsfo => 198.35.26.106
}
}
upload-addrs => {
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 936ad62..a30b620 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -80,7 +80,7 @@
bits 600 DYNA geoip!bits-addrs
upload 600 DYNA geoip!upload-addrs
m 600 DYNA geoip!mobile-addrs
-geoiplookup 600 DYNA geoip!bits-addrs-v4
+geoiplookup 600 DYNA geoip!text-addrs-v4
donate 600 DYNA geoip!text-addrs-v4
; Legacy geo-lb hostnames - no longer referenced
@@ -230,7 +230,7 @@
misc-web-lb.eqiad 1H IN A 208.80.154.241
1H IN AAAA 2620:0:861:ed1a::11
-geoiplookup-lb.eqiad 600 IN DYNA geoip!bits-addrs-v4/eqiad
+geoiplookup-lb.eqiad 600 IN DYNA geoip!text-addrs-v4/eqiad
parsoid-lb.eqiad 1H IN A 208.80.154.248
1H IN AAAA 2620:0:861:ed1a::3:14
@@ -256,7 +256,7 @@
bits-lb.ulsfo 600 IN DYNA geoip!bits-addrs/ulsfo
upload-lb.ulsfo 600 IN DYNA geoip!upload-addrs/ulsfo
mobile-lb.ulsfo 600 IN DYNA geoip!mobile-addrs/ulsfo
-geoiplookup-lb.ulsfo 600 IN DYNA geoip!bits-addrs-v4/ulsfo
+geoiplookup-lb.ulsfo 600 IN DYNA geoip!text-addrs-v4/ulsfo
donate-lb.ulsfo 600 IN DYNA geoip!text-addrs-v4/ulsfo
1H IN MX 10 polonium.wikimedia.org.
1H IN MX 50 lead.wikimedia.org.
@@ -750,7 +750,7 @@
bits-lb 600 IN DYNA geoip!bits-addrs/esams
upload-lb 600 IN DYNA geoip!upload-addrs/esams
mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
-geoiplookup-lb 600 IN DYNA geoip!bits-addrs-v4/esams
+geoiplookup-lb 600 IN DYNA geoip!text-addrs-v4/esams
donate-lb 600 IN DYNA geoip!text-addrs-v4/esams
1H IN MX 10 polonium.wikimedia.org.
1H IN MX 50 lead.wikimedia.org.
--
To view, visit https://gerrit.wikimedia.org/r/209174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia95d1b550206297b3f78f736230b308d9b71d5a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
