BBlack has submitted this change and it was merged.
Change subject: Switch uploads to temporary map for ulsfo turnup
......................................................................
Switch uploads to temporary map for ulsfo turnup
uploads traffic that was normally directed to ulsfo
is currently being sent to esams, and needs to be brought
back in chunks. This is the first step in that process:
define a temporary map based on generic-map which has
all ulsfo (other than WMF OIT) replaced with esams,
use it for the upload-lb decision, and use the correct
ulsfo CNAME there.
Change-Id: I13b39d1142b1ccb720c8e4835d4407874bf1dbe9
---
M config-geo
1 file changed, 206 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index 1920da6..1da2869 100644
--- a/config-geo
+++ b/config-geo
@@ -1,5 +1,209 @@
plugins => { geoip => {
maps => {
+ temporary-upload-map => { # for bringing upload traffic back to ulsfo
gradually
+ geoip_db => /usr/share/GeoIP/GeoLiteCityv6.dat
+ geoip_db_v4_overlay => /usr/share/GeoIP/GeoIPCity.dat
+ datacenters => [eqiad esams ulsfo]
+ map => {
+ # use ISO 3166-2 official names
+ AF => esams,
+ AS => {
+ AE => esams, # United Arab Emirates
+ AF => eqiad, # Afghanistan
+ AM => esams, # Armenia
+ AP => esams, # ex-ulsfo # Asia-Pacific region (misc)
+ AZ => esams, # Azerbaijan
+ BD => esams, # ex-ulsfo # Bangladesh
+ BH => esams, # Bahrain
+ BN => esams, # ex-ulsfo # Brunei Darussalam
+ BT => esams, # ex-ulsfo # Bhutan
+ CC => esams, # ex-ulsfo # Cocos (Keeling) Islands
+ CN => eqiad, # China
+ CX => esams, # ex-ulsfo # Christmas Island
+ CY => esams, # Cyprus
+ GE => esams, # Georgia
+ HK => esams, # ex-ulsfo # Hong Kong
+ ID => esams, # ex-ulsfo # Indonesia
+ IL => esams, # Israel
+ IN => eqiad, # India
+ IO => eqiad, # British Indian Ocean Territory
+ IQ => esams, # Iraq
+ IR => esams, # Iran (Islamic Republic of)
+ JO => esams, # Jordan
+ JP => esams, # ex-ulsfo # Japan
+ KG => eqiad, # Kyrgyzstan
+ KH => esams, # ex-ulsfo # Cambodia
+ KP => esams, # ex-ulsfo # Korea, Democratic People's
Republic of
+ KR => esams, # ex-ulsfo # Korea, Republic of
+ KW => esams, # Kuwait
+ KZ => eqiad, # Kazakhstan
+ LA => esams, # ex-ulsfo # Lao People's Democratic Republic
+ LB => esams, # Lebanon
+ LK => eqiad, # Sri Lanka
+ MM => esams, # ex-ulsfo # Myanmar
+ MN => esams, # ex-ulsfo # Mongolia
+ MO => esams, # ex-ulsfo # Macao
+ MV => esams, # ex-ulsfo # Maldives
+ MY => esams, # ex-ulsfo # Malaysia
+ NP => esams, # ex-ulsfo # Nepal
+ OM => esams, # Oman
+ PH => esams, # ex-ulsfo # Philippines
+ PK => eqiad, # Pakistan
+ PS => esams, # Palestine, State of
+ QA => esams, # Qatar
+ SA => esams, # Saudi Arabia
+ SG => esams, # ex-ulsfo # Singapore
+ SY => esams, # Syrian Arab Republic
+ TH => esams, # ex-ulsfo # Thailand
+ TJ => eqiad, # Tajikistan
+ TL => esams, # ex-ulsfo # Timor-Leste
+ TM => eqiad, # Turkmenistan
+ TW => esams, # ex-ulsfo # Taiwan, Province of China
+ UZ => eqiad, # Uzbekistan
+ VN => esams, # ex-ulsfo # Viet Nam
+ YE => esams, # Yemen
+ },
+ EU => {
+ AD => esams, # Andorra
+ AL => esams, # Albania
+ AT => esams, # Austria
+ AX => esams, # Åland Islands
+ BA => esams, # Bosnia and Herzegowina
+ BE => esams, # Belgium
+ BG => esams, # Bulgaria
+ BY => esams, # Belarus
+ CH => esams, # Switzerland
+ CZ => esams, # Czech Republic
+ DE => esams, # Germany
+ DK => esams, # Denmark
+ EE => esams, # Estonia
+ ES => esams, # Spain
+ EU => esams, # Europe region (misc)
+ FI => esams, # Finland
+ FO => esams, # Faroe Islands
+ FR => esams, # France
+ GB => esams, # United Kingdom
+ GG => esams, # Guernsey
+ GI => esams, # Gibraltar
+ GR => esams, # Greece
+ HR => esams, # Croatia (local name Hrvatska)
+ HU => esams, # Hungary
+ IE => esams, # Ireland
+ IM => esams, # Isle of Man
+ IS => esams, # Iceland
+ IT => esams, # Italy
+ JE => esams, # Jersey
+ LI => esams, # Liechtenstein
+ LT => esams, # Lithuania
+ LU => esams, # Luxembourg
+ LV => esams, # Latvia
+ MC => esams, # Monaco
+ MD => esams, # Moldova, Republic of
+ ME => esams, # Montenegro
+ MK => esams, # Macedonia, the Former Yugoslav Republic of
+ MT => esams, # Malta
+ NL => esams, # Netherlands
+ NO => esams, # Norway
+ PL => esams, # Poland
+ PT => esams, # Portugal
+ RO => esams, # Romania
+ RS => esams, # Serbia
+ RU => esams, # Russian Federation
+ SE => esams, # Sweden
+ SI => esams, # Slovenia
+ SJ => esams, # Svalbard and Jan Mayen Islands
+ SK => esams, # Slovakia
+ SM => esams, # San Marino
+ TR => esams, # Turkey
+ UA => esams, # Ukraine
+ VA => esams, # Holy See (Vatican City State)
+ },
+ NA => {
+ US => { # United States of America
+ AK => esams, # ex-ulsfo # Alaska
+ AL => eqiad, # Alabama
+ AR => eqiad, # Arkansas
+ AZ => esams, # ex-ulsfo # Arizona
+ CA => esams, # ex-ulsfo # California
+ CO => esams, # ex-ulsfo # Colorado
+ CT => eqiad, # Connecticut
+ DC => eqiad, # District of Columbia
+ DE => eqiad, # Delaware
+ FL => eqiad, # Florida
+ GA => eqiad, # Georgia
+ HI => esams, # ex-ulsfo # Hawaii
+ IA => eqiad, # Iowa
+ ID => esams, # ex-ulsfo # Idaho
+ IL => eqiad, # Illinois
+ IN => eqiad, # Indiana
+ KS => eqiad, # Kansas
+ KY => eqiad, # Kentucky
+ LA => eqiad, # Louisiana
+ MA => eqiad, # Massachusetts
+ MD => eqiad, # Maryland
+ ME => eqiad, # Maine
+ MI => eqiad, # Michigan
+ MN => eqiad, # Minnesota
+ MO => eqiad, # Missouri
+ MS => eqiad, # Mississippi
+ MT => esams, # ex-ulsfo # Montana
+ NC => eqiad, # North Carolina
+ ND => eqiad, # North Dakota
+ NE => eqiad, # Nebraska
+ NH => eqiad, # New Hampshire
+ NJ => eqiad, # New Jersey
+ NM => esams, # ex-ulsfo # New Mexico
+ NV => esams, # ex-ulsfo # Nevada
+ NY => eqiad, # New York
+ OH => eqiad, # Ohio
+ OK => eqiad, # Oklahoma
+ OR => esams, # ex-ulsfo # Oregon
+ PA => eqiad, # Pennsylvania
+ RI => eqiad, # Rhode Island
+ SC => eqiad, # South Carolina
+ SD => eqiad, # South Dakota
+ TN => eqiad, # Tennessee
+ TX => eqiad, # Texas
+ UT => esams, # ex-ulsfo # Utah
+ VA => eqiad, # Virginia
+ VT => eqiad, # Vermont
+ WA => esams, # ex-ulsfo # Washington
+ WI => eqiad, # Wisconsin
+ WV => eqiad, # West Virginia
+ WY => esams, # ex-ulsfo # Wyoming
+ },
+ CA => { # Canada
+ AB => esams, # ex-ulsfo # Alberta
+ BC => esams, # ex-ulsfo # British Columbia
+ MB => eqiad, # Manitoba
+ NB => eqiad, # New Brunswick
+ NL => eqiad, # Newfoundland
+ NS => eqiad, # Nova Scotia
+ NT => esams, # ex-ulsfo # Northwest Territories
+ NU => eqiad, # Nunavut
+ ON => eqiad, # Ontario
+ PE => eqiad, # Prince Edward Island
+ QC => eqiad, # Quebec
+ SK => eqiad, # Saskatchewan
+ YT => esams, # ex-ulsfo # Yukon Territory
+ },
+ },
+ OC => esams, # ex-ulsfo
+ default => eqiad,
+ },
+ nets = {
+ 208.80.152.0/22 => eqiad, # pmtpa, eqiad
+ 91.198.174.0/24 => esams, # esams
+ 185.15.56.0/22 => esams, # esams
+ 198.35.26.0/23 => eqiad, # ulsfo
+ 2620:0:860::/48 => eqiad, # pmtpa
+ 2620:0:861::/48 => eqiad, # eqiad
+ 2620:0:862::/48 => esams, # esams
+ 2620:0:863::/48 => eqiad, # ulsfo
+ 198.73.209.0/24 => ulsfo, # WMF OIT
+ 2620:62:c000::/48 => ulsfo, # WMF OIT
+ },
+ },
generic-map => {
geoip_db => /usr/share/GeoIP/GeoLiteCityv6.dat
geoip_db_v4_overlay => /usr/share/GeoIP/GeoIPCity.dat
@@ -223,11 +427,11 @@
}
}
upload => {
- map => generic-map
+ map => temporary-upload-map
dcmap => {
eqiad => upload-lb.eqiad.wikimedia.org.
esams => upload-lb.esams.wikimedia.org.
- ulsfo => upload-lb.esams.wikimedia.org.
+ ulsfo => upload-lb.ulsfo.wikimedia.org.
}
}
geoiplookup => {
--
To view, visit https://gerrit.wikimedia.org/r/152844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13b39d1142b1ccb720c8e4835d4407874bf1dbe9
Gerrit-PatchSet: 1
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
