Faidon Liambotis has submitted this change and it was merged.

Change subject: Add codfw everywhere on the map
......................................................................


Add codfw everywhere on the map

This adds codfw as a backup (mostly to eqiad) everywhere on the map. In
the few cases where we had directed traffic to codfw already (Texas,
Mexico, etc.), it keeps it at the front of eqiad.

The intent of this commit is to give us the ability to set eqiad's
admin_state as "down".

Note that this does not handle trickier situations yet, like the failure
of all of ulsfo, esams and codfw; the map was limited like that before,
in particularly in Asia.

Change-Id: I0274b1bf61d0203b525e18a353d32af823a6e194
---
M config-geo
1 file changed, 189 insertions(+), 189 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/config-geo b/config-geo
index e505a94..cc5ca09 100644
--- a/config-geo
+++ b/config-geo
@@ -5,191 +5,191 @@
             datacenters => [eqiad codfw esams ulsfo]
             map => {
                 # use ISO 3166-2 official names
-                AF => [esams, eqiad], # ESAMS-EQIAD
+                AF => [esams, eqiad, codfw],
                 AS => {
-                    AE => [esams, ulsfo], # ESAMS-ULSFO # United Arab Emirates
-                    AF => [eqiad       ], # Afghanistan
-                    AM => [esams, ulsfo], # ESAMS-ULSFO # Armenia
-                    AP => [ulsfo, eqiad], # Asia-Pacific region (misc)
-                    AZ => [esams, ulsfo], # ESAMS-ULSFO # Azerbaijan
-                    BD => [ulsfo, eqiad], # Bangladesh
-                    BH => [esams, ulsfo], # ESAMS-ULSFO # Bahrain
-                    BN => [ulsfo, eqiad], # Brunei Darussalam
-                    BT => [ulsfo, eqiad], # Bhutan
-                    CC => [ulsfo, eqiad], # Cocos (Keeling) Islands
-                    CN => [ulsfo, eqiad], # China
-                    CX => [ulsfo, eqiad], # Christmas Island
-                    CY => [esams, ulsfo], # ESAMS-ULSFO # Cyprus
-                    GE => [esams, ulsfo], # ESAMS-ULSFO # Georgia
-                    HK => [ulsfo, eqiad], # Hong Kong
-                    ID => [ulsfo, eqiad], # Indonesia
-                    IL => [esams, ulsfo], # ESAMS-ULSFO # Israel
-                    IN => [eqiad       ], # India
-                    IO => [eqiad       ], # British Indian Ocean Territory
-                    IQ => [esams, ulsfo], # ESAMS-ULSFO # Iraq
-                    IR => [esams, ulsfo], # ESAMS-ULSFO # Iran (Islamic 
Republic of)
-                    JO => [esams, ulsfo], # ESAMS-ULSFO # Jordan
-                    JP => [ulsfo, eqiad], # Japan
-                    KG => [eqiad       ], # Kyrgyzstan
-                    KH => [ulsfo, eqiad], # Cambodia
-                    KP => [ulsfo, eqiad], # Korea, Democratic People's 
Republic of
-                    KR => [ulsfo, eqiad], # Korea, Republic of
-                    KW => [esams, ulsfo], # ESAMS-ULSFO # Kuwait
-                    KZ => [eqiad       ], # Kazakhstan
-                    LA => [ulsfo, eqiad], # Lao People's Democratic Republic
-                    LB => [esams, ulsfo], # ESAMS-ULSFO # Lebanon
-                    LK => [eqiad       ], # Sri Lanka
-                    MM => [ulsfo, eqiad], # Myanmar
-                    MN => [ulsfo, eqiad], # Mongolia
-                    MO => [ulsfo, eqiad], # Macao
-                    MV => [ulsfo, eqiad], # Maldives
-                    MY => [ulsfo, eqiad], # Malaysia
-                    NP => [ulsfo, eqiad], # Nepal
-                    OM => [esams, ulsfo], # ESAMS-ULSFO # Oman
-                    PH => [ulsfo, eqiad], # Philippines
-                    PK => [eqiad       ], # Pakistan
-                    PS => [esams, ulsfo], # ESAMS-ULSFO # Palestine, State of
-                    QA => [esams, ulsfo], # ESAMS-ULSFO # Qatar
-                    SA => [esams, ulsfo], # ESAMS-ULSFO # Saudi Arabia
-                    SG => [ulsfo, eqiad], # Singapore
-                    SY => [esams, ulsfo], # ESAMS-ULSFO # Syrian Arab Republic
-                    TH => [ulsfo, eqiad], # Thailand
-                    TJ => [eqiad       ], # Tajikistan
-                    TL => [ulsfo, eqiad], # Timor-Leste
-                    TM => [eqiad       ], # Turkmenistan
-                    TW => [ulsfo, eqiad], # Taiwan, Province of China
-                    UZ => [eqiad       ], # Uzbekistan
-                    VN => [ulsfo, eqiad], # Viet Nam
-                    YE => [esams, ulsfo], # ESAMS-ULSFO # Yemen
+                    AE => [esams, ulsfo, codfw], # United Arab Emirates
+                    AF => [       eqiad, codfw], # Afghanistan
+                    AM => [esams, ulsfo, codfw], # Armenia
+                    AP => [ulsfo, eqiad, codfw], # Asia-Pacific region (misc)
+                    AZ => [esams, ulsfo, codfw], # Azerbaijan
+                    BD => [ulsfo, eqiad, codfw], # Bangladesh
+                    BH => [esams, ulsfo, codfw], # Bahrain
+                    BN => [ulsfo, eqiad, codfw], # Brunei Darussalam
+                    BT => [ulsfo, eqiad, codfw], # Bhutan
+                    CC => [ulsfo, eqiad, codfw], # Cocos (Keeling) Islands
+                    CN => [ulsfo, eqiad, codfw], # China
+                    CX => [ulsfo, eqiad, codfw], # Christmas Island
+                    CY => [esams, ulsfo, codfw], # Cyprus
+                    GE => [esams, ulsfo, codfw], # Georgia
+                    HK => [ulsfo, eqiad, codfw], # Hong Kong
+                    ID => [ulsfo, eqiad, codfw], # Indonesia
+                    IL => [esams, ulsfo, codfw], # Israel
+                    IN => [       eqiad, codfw], # India
+                    IO => [       eqiad, codfw], # British Indian Ocean 
Territory
+                    IQ => [esams, ulsfo, codfw], # Iraq
+                    IR => [esams, ulsfo, codfw], # Iran (Islamic Republic of)
+                    JO => [esams, ulsfo, codfw], # Jordan
+                    JP => [ulsfo, eqiad, codfw], # Japan
+                    KG => [       eqiad, codfw], # Kyrgyzstan
+                    KH => [ulsfo, eqiad, codfw], # Cambodia
+                    KP => [ulsfo, eqiad, codfw], # Korea, Democratic People's 
Republic of
+                    KR => [ulsfo, eqiad, codfw], # Korea, Republic of
+                    KW => [esams, ulsfo, codfw], # Kuwait
+                    KZ => [       eqiad, codfw], # Kazakhstan
+                    LA => [ulsfo, eqiad, codfw], # Lao People's Democratic 
Republic
+                    LB => [esams, ulsfo, codfw], # Lebanon
+                    LK => [       eqiad, codfw], # Sri Lanka
+                    MM => [ulsfo, eqiad, codfw], # Myanmar
+                    MN => [ulsfo, eqiad, codfw], # Mongolia
+                    MO => [ulsfo, eqiad, codfw], # Macao
+                    MV => [ulsfo, eqiad, codfw], # Maldives
+                    MY => [ulsfo, eqiad, codfw], # Malaysia
+                    NP => [ulsfo, eqiad, codfw], # Nepal
+                    OM => [esams, ulsfo, codfw], # Oman
+                    PH => [ulsfo, eqiad, codfw], # Philippines
+                    PK => [       eqiad, codfw], # Pakistan
+                    PS => [esams, ulsfo, codfw], # Palestine, State of
+                    QA => [esams, ulsfo, codfw], # Qatar
+                    SA => [esams, ulsfo, codfw], # Saudi Arabia
+                    SG => [ulsfo, eqiad, codfw], # Singapore
+                    SY => [esams, ulsfo, codfw], # Syrian Arab Republic
+                    TH => [ulsfo, eqiad, codfw], # Thailand
+                    TJ => [       eqiad, codfw], # Tajikistan
+                    TL => [ulsfo, eqiad, codfw], # Timor-Leste
+                    TM => [       eqiad, codfw], # Turkmenistan
+                    TW => [ulsfo, eqiad, codfw], # Taiwan, Province of China
+                    UZ => [       eqiad, codfw], # Uzbekistan
+                    VN => [ulsfo, eqiad, codfw], # Viet Nam
+                    YE => [esams, ulsfo, codfw], # Yemen
                 },
                 EU => {
-                    AD => [esams, eqiad], # ESAMS-EQIAD # Andorra
-                    AL => [esams, eqiad], # ESAMS-EQIAD # Albania
-                    AT => [esams, eqiad], # ESAMS-EQIAD # Austria
-                    AX => [esams, eqiad], # ESAMS-EQIAD # Åland Islands
-                    BA => [esams, eqiad], # ESAMS-EQIAD # Bosnia and 
Herzegowina
-                    BE => [esams, eqiad], # ESAMS-EQIAD # Belgium
-                    BG => [esams, eqiad], # ESAMS-EQIAD # Bulgaria
-                    BY => [esams, eqiad], # ESAMS-EQIAD # Belarus
-                    CH => [esams, eqiad], # ESAMS-EQIAD # Switzerland
-                    CZ => [esams, eqiad], # ESAMS-EQIAD # Czech Republic
-                    DE => [esams, eqiad], # ESAMS-EQIAD # Germany
-                    DK => [esams, eqiad], # ESAMS-EQIAD # Denmark
-                    EE => [esams, eqiad], # ESAMS-EQIAD # Estonia
-                    ES => [esams, eqiad], # ESAMS-EQIAD # Spain
-                    EU => [esams, eqiad], # ESAMS-EQIAD # Europe region (misc)
-                    FI => [esams, eqiad], # ESAMS-EQIAD # Finland
-                    FO => [esams, eqiad], # ESAMS-EQIAD # Faroe Islands
-                    FR => [esams, eqiad], # ESAMS-EQIAD # France
-                    GB => [esams, eqiad], # ESAMS-EQIAD # United Kingdom
-                    GG => [esams, eqiad], # ESAMS-EQIAD # Guernsey
-                    GI => [esams, eqiad], # ESAMS-EQIAD # Gibraltar
-                    GR => [esams, eqiad], # ESAMS-EQIAD # Greece
-                    HR => [esams, eqiad], # ESAMS-EQIAD # Croatia (local name 
Hrvatska)
-                    HU => [esams, eqiad], # ESAMS-EQIAD # Hungary
-                    IE => [esams, eqiad], # ESAMS-EQIAD # Ireland
-                    IM => [esams, eqiad], # ESAMS-EQIAD # Isle of Man
-                    IS => [esams, eqiad], # ESAMS-EQIAD # Iceland
-                    IT => [esams, eqiad], # ESAMS-EQIAD # Italy
-                    JE => [esams, eqiad], # ESAMS-EQIAD # Jersey
-                    LI => [esams, eqiad], # ESAMS-EQIAD # Liechtenstein
-                    LT => [esams, eqiad], # ESAMS-EQIAD # Lithuania
-                    LU => [esams, eqiad], # ESAMS-EQIAD # Luxembourg
-                    LV => [esams, eqiad], # ESAMS-EQIAD # Latvia
-                    MC => [esams, eqiad], # ESAMS-EQIAD # Monaco
-                    MD => [esams, eqiad], # ESAMS-EQIAD # Moldova, Republic of
-                    ME => [esams, eqiad], # ESAMS-EQIAD # Montenegro
-                    MK => [esams, eqiad], # ESAMS-EQIAD # Macedonia, the 
Former Yugoslav Republic of
-                    MT => [esams, eqiad], # ESAMS-EQIAD # Malta
-                    NL => [esams, eqiad], # ESAMS-EQIAD # Netherlands
-                    NO => [esams, eqiad], # ESAMS-EQIAD # Norway
-                    PL => [esams, eqiad], # ESAMS-EQIAD # Poland
-                    PT => [esams, eqiad], # ESAMS-EQIAD # Portugal
-                    RO => [esams, eqiad], # ESAMS-EQIAD # Romania
-                    RS => [esams, eqiad], # ESAMS-EQIAD # Serbia
-                    RU => [esams, ulsfo], # ESAMS-ULSFO # Russian Federation
-                    SE => [esams, eqiad], # ESAMS-EQIAD # Sweden
-                    SI => [esams, eqiad], # ESAMS-EQIAD # Slovenia
-                    SJ => [esams, eqiad], # ESAMS-EQIAD # Svalbard and Jan 
Mayen Islands
-                    SK => [esams, eqiad], # ESAMS-EQIAD # Slovakia
-                    SM => [esams, eqiad], # ESAMS-EQIAD # San Marino
-                    TR => [esams, eqiad], # ESAMS-EQIAD # Turkey
-                    UA => [esams, eqiad], # ESAMS-EQIAD # Ukraine
-                    VA => [esams, eqiad], # ESAMS-EQIAD # Holy See (Vatican 
City State)
+                    AD => [esams, eqiad, codfw], # Andorra
+                    AL => [esams, eqiad, codfw], # Albania
+                    AT => [esams, eqiad, codfw], # Austria
+                    AX => [esams, eqiad, codfw], # Åland Islands
+                    BA => [esams, eqiad, codfw], # Bosnia and Herzegowina
+                    BE => [esams, eqiad, codfw], # Belgium
+                    BG => [esams, eqiad, codfw], # Bulgaria
+                    BY => [esams, eqiad, codfw], # Belarus
+                    CH => [esams, eqiad, codfw], # Switzerland
+                    CZ => [esams, eqiad, codfw], # Czech Republic
+                    DE => [esams, eqiad, codfw], # Germany
+                    DK => [esams, eqiad, codfw], # Denmark
+                    EE => [esams, eqiad, codfw], # Estonia
+                    ES => [esams, eqiad, codfw], # Spain
+                    EU => [esams, eqiad, codfw], # Europe region (misc)
+                    FI => [esams, eqiad, codfw], # Finland
+                    FO => [esams, eqiad, codfw], # Faroe Islands
+                    FR => [esams, eqiad, codfw], # France
+                    GB => [esams, eqiad, codfw], # United Kingdom
+                    GG => [esams, eqiad, codfw], # Guernsey
+                    GI => [esams, eqiad, codfw], # Gibraltar
+                    GR => [esams, eqiad, codfw], # Greece
+                    HR => [esams, eqiad, codfw], # Croatia (local name 
Hrvatska)
+                    HU => [esams, eqiad, codfw], # Hungary
+                    IE => [esams, eqiad, codfw], # Ireland
+                    IM => [esams, eqiad, codfw], # Isle of Man
+                    IS => [esams, eqiad, codfw], # Iceland
+                    IT => [esams, eqiad, codfw], # Italy
+                    JE => [esams, eqiad, codfw], # Jersey
+                    LI => [esams, eqiad, codfw], # Liechtenstein
+                    LT => [esams, eqiad, codfw], # Lithuania
+                    LU => [esams, eqiad, codfw], # Luxembourg
+                    LV => [esams, eqiad, codfw], # Latvia
+                    MC => [esams, eqiad, codfw], # Monaco
+                    MD => [esams, eqiad, codfw], # Moldova, Republic of
+                    ME => [esams, eqiad, codfw], # Montenegro
+                    MK => [esams, eqiad, codfw], # Macedonia, the Former 
Yugoslav Republic of
+                    MT => [esams, eqiad, codfw], # Malta
+                    NL => [esams, eqiad, codfw], # Netherlands
+                    NO => [esams, eqiad, codfw], # Norway
+                    PL => [esams, eqiad, codfw], # Poland
+                    PT => [esams, eqiad, codfw], # Portugal
+                    RO => [esams, eqiad, codfw], # Romania
+                    RS => [esams, eqiad, codfw], # Serbia
+                    RU => [esams, ulsfo, codfw], # Russian Federation
+                    SE => [esams, eqiad, codfw], # Sweden
+                    SI => [esams, eqiad, codfw], # Slovenia
+                    SJ => [esams, eqiad, codfw], # Svalbard and Jan Mayen 
Islands
+                    SK => [esams, eqiad, codfw], # Slovakia
+                    SM => [esams, eqiad, codfw], # San Marino
+                    TR => [esams, eqiad, codfw], # Turkey
+                    UA => [esams, eqiad, codfw], # Ukraine
+                    VA => [esams, eqiad, codfw], # Holy See (Vatican City 
State)
                 },
                 NA => {
                     US => { # United States of America
-                        AK => [ulsfo, eqiad], # Alaska
-                        AL => [eqiad       ], # Alabama
-                        AR => [codfw, eqiad], # Arkansas
-                        AZ => [ulsfo, eqiad], # Arizona
-                        CA => [ulsfo, eqiad], # California
-                        CO => [ulsfo, eqiad], # Colorado
-                        CT => [eqiad       ], # Connecticut
-                        DC => [eqiad       ], # District of Columbia
-                        DE => [eqiad       ], # Delaware
-                        FL => [eqiad       ], # Florida
-                        GA => [eqiad       ], # Georgia
-                        HI => [ulsfo, eqiad], # Hawaii
-                        IA => [eqiad       ], # Iowa
-                        ID => [ulsfo, eqiad], # Idaho
-                        IL => [eqiad       ], # Illinois
-                        IN => [eqiad       ], # Indiana
-                        KS => [eqiad       ], # Kansas
-                        KY => [eqiad       ], # Kentucky
-                        LA => [codfw, eqiad], # Louisiana
-                        MA => [eqiad       ], # Massachusetts
-                        MD => [eqiad       ], # Maryland
-                        ME => [eqiad       ], # Maine
-                        MI => [eqiad       ], # Michigan
-                        MN => [eqiad       ], # Minnesota
-                        MO => [eqiad       ], # Missouri
-                        MS => [eqiad       ], # Mississippi
-                        MT => [ulsfo, eqiad], # Montana
-                        NC => [eqiad       ], # North Carolina
-                        ND => [eqiad       ], # North Dakota
-                        NE => [eqiad       ], # Nebraska
-                        NH => [eqiad       ], # New Hampshire
-                        NJ => [eqiad       ], # New Jersey
-                        NM => [codfw, eqiad], # New Mexico
-                        NV => [ulsfo, eqiad], # Nevada
-                        NY => [eqiad       ], # New York
-                        OH => [eqiad       ], # Ohio
-                        OK => [codfw, eqiad], # Oklahoma
-                        OR => [ulsfo, eqiad], # Oregon
-                        PA => [eqiad       ], # Pennsylvania
-                        RI => [eqiad       ], # Rhode Island
-                        SC => [eqiad       ], # South Carolina
-                        SD => [eqiad       ], # South Dakota
-                        TN => [eqiad       ], # Tennessee
-                        TX => [codfw, eqiad], # Texas
-                        UT => [ulsfo, eqiad], # Utah
-                        VA => [eqiad       ], # Virginia
-                        VT => [eqiad       ], # Vermont
-                        WA => [ulsfo, eqiad], # Washington
-                        WI => [eqiad       ], # Wisconsin
-                        WV => [eqiad       ], # West Virginia
-                        WY => [ulsfo, eqiad], # Wyoming
+                        AK => [ulsfo, eqiad, codfw], # Alaska
+                        AL => [       eqiad, codfw], # Alabama
+                        AR => [       codfw, eqiad], # Arkansas
+                        AZ => [ulsfo, eqiad, codfw], # Arizona
+                        CA => [ulsfo, eqiad, codfw], # California
+                        CO => [ulsfo, eqiad, codfw], # Colorado
+                        CT => [       eqiad, codfw], # Connecticut
+                        DC => [       eqiad, codfw], # District of Columbia
+                        DE => [       eqiad, codfw], # Delaware
+                        FL => [       eqiad, codfw], # Florida
+                        GA => [       eqiad, codfw], # Georgia
+                        HI => [ulsfo, eqiad, codfw], # Hawaii
+                        IA => [       eqiad, codfw], # Iowa
+                        ID => [ulsfo, eqiad, codfw], # Idaho
+                        IL => [       eqiad, codfw], # Illinois
+                        IN => [       eqiad, codfw], # Indiana
+                        KS => [       eqiad, codfw], # Kansas
+                        KY => [       eqiad, codfw], # Kentucky
+                        LA => [       codfw, eqiad], # Louisiana
+                        MA => [       eqiad, codfw], # Massachusetts
+                        MD => [       eqiad, codfw], # Maryland
+                        ME => [       eqiad, codfw], # Maine
+                        MI => [       eqiad, codfw], # Michigan
+                        MN => [       eqiad, codfw], # Minnesota
+                        MO => [       eqiad, codfw], # Missouri
+                        MS => [       eqiad, codfw], # Mississippi
+                        MT => [ulsfo, eqiad, codfw], # Montana
+                        NC => [       eqiad, codfw], # North Carolina
+                        ND => [       eqiad, codfw], # North Dakota
+                        NE => [       eqiad, codfw], # Nebraska
+                        NH => [       eqiad, codfw], # New Hampshire
+                        NJ => [       eqiad, codfw], # New Jersey
+                        NM => [       codfw, eqiad], # New Mexico
+                        NV => [ulsfo, eqiad, codfw], # Nevada
+                        NY => [       eqiad, codfw], # New York
+                        OH => [       eqiad, codfw], # Ohio
+                        OK => [       codfw, eqiad], # Oklahoma
+                        OR => [ulsfo, eqiad, codfw], # Oregon
+                        PA => [       eqiad, codfw], # Pennsylvania
+                        RI => [       eqiad, codfw], # Rhode Island
+                        SC => [       eqiad, codfw], # South Carolina
+                        SD => [       eqiad, codfw], # South Dakota
+                        TN => [       eqiad, codfw], # Tennessee
+                        TX => [       codfw, eqiad], # Texas
+                        UT => [ulsfo, eqiad, codfw], # Utah
+                        VA => [       eqiad, codfw], # Virginia
+                        VT => [       eqiad, codfw], # Vermont
+                        WA => [ulsfo, eqiad, codfw], # Washington
+                        WI => [       eqiad, codfw], # Wisconsin
+                        WV => [       eqiad, codfw], # West Virginia
+                        WY => [ulsfo, eqiad, codfw], # Wyoming
                     },
                     CA => { # Canada
-                        AB => [ulsfo, eqiad], # Alberta
-                        BC => [ulsfo, eqiad], # British Columbia
-                        MB => [eqiad       ], # Manitoba
-                        NB => [eqiad       ], # New Brunswick
-                        NL => [eqiad       ], # Newfoundland
-                        NS => [eqiad       ], # Nova Scotia
-                        NT => [ulsfo, eqiad], # Northwest Territories
-                        NU => [eqiad       ], # Nunavut
-                        ON => [eqiad       ], # Ontario
-                        PE => [eqiad       ], # Prince Edward Island
-                        QC => [eqiad       ], # Quebec
-                        SK => [eqiad       ], # Saskatchewan
-                        YT => [ulsfo, eqiad], # Yukon Territory
+                        AB => [ulsfo, eqiad, codfw], # Alberta
+                        BC => [ulsfo, eqiad, codfw], # British Columbia
+                        MB => [       eqiad, codfw], # Manitoba
+                        NB => [       eqiad, codfw], # New Brunswick
+                        NL => [       eqiad, codfw], # Newfoundland
+                        NS => [       eqiad, codfw], # Nova Scotia
+                        NT => [ulsfo, eqiad, codfw], # Northwest Territories
+                        NU => [       eqiad, codfw], # Nunavut
+                        ON => [       eqiad, codfw], # Ontario
+                        PE => [       eqiad, codfw], # Prince Edward Island
+                        QC => [       eqiad, codfw], # Quebec
+                        SK => [       eqiad, codfw], # Saskatchewan
+                        YT => [ulsfo, eqiad, codfw], # Yukon Territory
                     },
-                    MX => [codfw, eqiad], # Mexico
+                    MX => [       codfw, eqiad], # Mexico
                 },
-                OC => [ulsfo, eqiad],
-                default => eqiad,
+                OC      => [ulsfo, eqiad, codfw],
+                default => [       eqiad, codfw],
             },
             nets = {
                 # Wikimedia address space
@@ -205,20 +205,20 @@
                 198.73.209.0/24   => [ulsfo, eqiad, codfw], # WMF OIT
                 2620:62:c000::/48 => [ulsfo, eqiad, codfw], # WMF OIT
                 # Level3's DNS clusters
-                192.221.132.0/22  => [eqiad       ], # Atlanta
-                192.221.136.0/22  => [eqiad       ], # Chicago
-                192.221.140.0/22  => [codfw, eqiad], # Dallas
-                192.221.148.0/22  => [ulsfo, eqiad], # Los Angeles
-                192.221.156.0/22  => [eqiad       ], # New York
-                192.221.160.0/22  => [ulsfo, eqiad], # San Jose
-                192.221.164.0/22  => [eqiad       ], # Washington, DC
-                8.0.4.0/22        => [eqiad       ], # Atlanta
-                8.0.8.0/22        => [eqiad       ], # Chicago
-                8.0.12.0/22       => [codfw, eqiad], # Dallas
-                8.0.20.0/22       => [ulsfo, eqiad], # Los Angeles
-                8.0.28.0/22       => [eqiad       ], # New York
-                8.0.32.0/22       => [ulsfo, eqiad], # San Jose
-                8.0.36.0/22       => [eqiad       ], # Washington, DC
+                192.221.132.0/22  => [       eqiad, codfw], # Atlanta
+                192.221.136.0/22  => [       eqiad, codfw], # Chicago
+                192.221.140.0/22  => [       codfw, eqiad], # Dallas
+                192.221.148.0/22  => [ulsfo, eqiad, codfw], # Los Angeles
+                192.221.156.0/22  => [       eqiad, codfw], # New York
+                192.221.160.0/22  => [ulsfo, eqiad, codfw], # San Jose
+                192.221.164.0/22  => [       eqiad, codfw], # Washington, DC
+                8.0.4.0/22        => [       eqiad, codfw], # Atlanta
+                8.0.8.0/22        => [       eqiad, codfw], # Chicago
+                8.0.12.0/22       => [       codfw, eqiad], # Dallas
+                8.0.20.0/22       => [ulsfo, eqiad, codfw], # Los Angeles
+                8.0.28.0/22       => [       eqiad, codfw], # New York
+                8.0.32.0/22       => [ulsfo, eqiad, codfw], # San Jose
+                8.0.36.0/22       => [       eqiad, codfw], # Washington, DC
             },
         },
     },

-- 
To view, visit https://gerrit.wikimedia.org/r/239070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0274b1bf61d0203b525e18a353d32af823a6e194
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to