BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389739 )
Change subject: eqsin DNS for hosts, services, geodns
......................................................................
eqsin DNS for hosts, services, geodns
Lacks asset tags (TBD when hardware installed)
Lacks network gear (TBD in future commits and/or when installed)
Bug: T156027
Bug: T156256
Change-Id: Ie77589bbecc1bad4e9e30ca2d692aba8a8f722d9
---
M admin_state
M geo-maps
M geo-resources
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/10.in-addr.arpa
M templates/166.102.103.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
8 files changed, 410 insertions(+), 213 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/39/389739/1
diff --git a/admin_state b/admin_state
index 54ee433..4cc2e1b 100644
--- a/admin_state
+++ b/admin_state
@@ -71,4 +71,5 @@
##############################################################################
### v T164610 - semi-permanent to avoid confusion until T164609
geoip/misc-addrs/ulsfo => DOWN
+geoip/misc-addrs/eqsin => DOWN
### ^ T164610 - semi-permanent to avoid confusion until T164609
diff --git a/geo-maps b/geo-maps
index 43c1155..3f97a93 100644
--- a/geo-maps
+++ b/geo-maps
@@ -1,235 +1,235 @@
generic-map => {
geoip2_db => /usr/share/GeoIP/GeoIP2-City.mmdb
- datacenters => [eqiad codfw esams ulsfo]
+ datacenters => [eqiad codfw esams ulsfo eqsin]
map => {
# use ISO 3166-2 official names
- AF => [esams, eqiad, codfw, ulsfo],
+ AF => [esams, eqiad, codfw, ulsfo, eqsin],
AS => {
- default => [ulsfo, codfw, eqiad, esams],
- AE => [esams, eqiad, codfw, ulsfo], # United Arab Emirates
- AF => [esams, eqiad, codfw, ulsfo], # Afghanistan
- AM => [esams, eqiad, codfw, ulsfo], # Armenia
- AP => [ulsfo, codfw, eqiad, esams], # Asia-Pacific region (misc)
- AZ => [esams, eqiad, codfw, ulsfo], # Azerbaijan
- BD => [ulsfo, codfw, eqiad, esams], # Bangladesh
- BH => [esams, eqiad, codfw, ulsfo], # Bahrain
- BN => [ulsfo, codfw, eqiad, esams], # Brunei Darussalam
- BT => [ulsfo, codfw, eqiad, esams], # Bhutan
- CC => [ulsfo, codfw, eqiad, esams], # Cocos (Keeling) Islands
- CN => [ulsfo, codfw, eqiad, esams], # China
- CX => [ulsfo, codfw, eqiad, esams], # Christmas Island
- CY => [esams, eqiad, codfw, ulsfo], # Cyprus
- GE => [esams, eqiad, codfw, ulsfo], # Georgia
- HK => [ulsfo, codfw, eqiad, esams], # Hong Kong
- ID => [ulsfo, codfw, eqiad, esams], # Indonesia
- IL => [esams, eqiad, codfw, ulsfo], # Israel
- IN => [esams, eqiad, codfw, ulsfo], # India
- IO => [esams, eqiad, codfw, ulsfo], # British Indian Ocean
Territory
- IQ => [esams, eqiad, codfw, ulsfo], # Iraq
- IR => [esams, eqiad, codfw, ulsfo], # Iran (Islamic Republic of)
- JO => [esams, eqiad, codfw, ulsfo], # Jordan
- JP => [ulsfo, codfw, eqiad, esams], # Japan
- KG => [esams, eqiad, codfw, ulsfo], # Kyrgyzstan
- KH => [ulsfo, codfw, eqiad, esams], # Cambodia
- KP => [ulsfo, codfw, eqiad, esams], # Korea, Democratic People's
Republic of
- KR => [ulsfo, codfw, eqiad, esams], # Korea, Republic of
- KW => [esams, eqiad, codfw, ulsfo], # Kuwait
- KZ => [esams, eqiad, codfw, ulsfo], # Kazakhstan
- LA => [ulsfo, codfw, eqiad, esams], # Lao People's Democratic
Republic
- LB => [esams, eqiad, codfw, ulsfo], # Lebanon
- LK => [esams, eqiad, codfw, ulsfo], # Sri Lanka
- MM => [ulsfo, codfw, eqiad, esams], # Myanmar
- MN => [ulsfo, codfw, eqiad, esams], # Mongolia
- MO => [ulsfo, codfw, eqiad, esams], # Macao
- MV => [ulsfo, codfw, eqiad, esams], # Maldives
- MY => [ulsfo, codfw, eqiad, esams], # Malaysia
- NP => [ulsfo, codfw, eqiad, esams], # Nepal
- OM => [esams, eqiad, codfw, ulsfo], # Oman
- PH => [ulsfo, codfw, eqiad, esams], # Philippines
- PK => [esams, eqiad, codfw, ulsfo], # Pakistan
- PS => [esams, eqiad, codfw, ulsfo], # Palestine, State of
- QA => [esams, eqiad, codfw, ulsfo], # Qatar
- SA => [esams, eqiad, codfw, ulsfo], # Saudi Arabia
- SG => [ulsfo, codfw, eqiad, esams], # Singapore
- SY => [esams, eqiad, codfw, ulsfo], # Syrian Arab Republic
- TH => [ulsfo, codfw, eqiad, esams], # Thailand
- TJ => [esams, eqiad, codfw, ulsfo], # Tajikistan
- TL => [ulsfo, codfw, eqiad, esams], # Timor-Leste
- TM => [esams, eqiad, codfw, ulsfo], # Turkmenistan
- TW => [ulsfo, codfw, eqiad, esams], # Taiwan, Province of China
- UZ => [esams, eqiad, codfw, ulsfo], # Uzbekistan
- VN => [ulsfo, codfw, eqiad, esams], # Viet Nam
- YE => [esams, eqiad, codfw, ulsfo], # Yemen
+ default => [ulsfo, codfw, eqiad, esams, eqsin],
+ AE => [esams, eqiad, codfw, ulsfo, eqsin], # United Arab Emirates
+ AF => [esams, eqiad, codfw, ulsfo, eqsin], # Afghanistan
+ AM => [esams, eqiad, codfw, ulsfo, eqsin], # Armenia
+ AP => [ulsfo, codfw, eqiad, esams, eqsin], # Asia-Pacific region
(misc)
+ AZ => [esams, eqiad, codfw, ulsfo, eqsin], # Azerbaijan
+ BD => [ulsfo, codfw, eqiad, esams, eqsin], # Bangladesh
+ BH => [esams, eqiad, codfw, ulsfo, eqsin], # Bahrain
+ BN => [ulsfo, codfw, eqiad, esams, eqsin], # Brunei Darussalam
+ BT => [ulsfo, codfw, eqiad, esams, eqsin], # Bhutan
+ CC => [ulsfo, codfw, eqiad, esams, eqsin], # Cocos (Keeling)
Islands
+ CN => [ulsfo, codfw, eqiad, esams, eqsin], # China
+ CX => [ulsfo, codfw, eqiad, esams, eqsin], # Christmas Island
+ CY => [esams, eqiad, codfw, ulsfo, eqsin], # Cyprus
+ GE => [esams, eqiad, codfw, ulsfo, eqsin], # Georgia
+ HK => [ulsfo, codfw, eqiad, esams, eqsin], # Hong Kong
+ ID => [ulsfo, codfw, eqiad, esams, eqsin], # Indonesia
+ IL => [esams, eqiad, codfw, ulsfo, eqsin], # Israel
+ IN => [esams, eqiad, codfw, ulsfo, eqsin], # India
+ IO => [esams, eqiad, codfw, ulsfo, eqsin], # British Indian Ocean
Territory
+ IQ => [esams, eqiad, codfw, ulsfo, eqsin], # Iraq
+ IR => [esams, eqiad, codfw, ulsfo, eqsin], # Iran (Islamic
Republic of)
+ JO => [esams, eqiad, codfw, ulsfo, eqsin], # Jordan
+ JP => [ulsfo, codfw, eqiad, esams, eqsin], # Japan
+ KG => [esams, eqiad, codfw, ulsfo, eqsin], # Kyrgyzstan
+ KH => [ulsfo, codfw, eqiad, esams, eqsin], # Cambodia
+ KP => [ulsfo, codfw, eqiad, esams, eqsin], # Korea, Democratic
People's Republic of
+ KR => [ulsfo, codfw, eqiad, esams, eqsin], # Korea, Republic of
+ KW => [esams, eqiad, codfw, ulsfo, eqsin], # Kuwait
+ KZ => [esams, eqiad, codfw, ulsfo, eqsin], # Kazakhstan
+ LA => [ulsfo, codfw, eqiad, esams, eqsin], # Lao People's
Democratic Republic
+ LB => [esams, eqiad, codfw, ulsfo, eqsin], # Lebanon
+ LK => [esams, eqiad, codfw, ulsfo, eqsin], # Sri Lanka
+ MM => [ulsfo, codfw, eqiad, esams, eqsin], # Myanmar
+ MN => [ulsfo, codfw, eqiad, esams, eqsin], # Mongolia
+ MO => [ulsfo, codfw, eqiad, esams, eqsin], # Macao
+ MV => [ulsfo, codfw, eqiad, esams, eqsin], # Maldives
+ MY => [ulsfo, codfw, eqiad, esams, eqsin], # Malaysia
+ NP => [ulsfo, codfw, eqiad, esams, eqsin], # Nepal
+ OM => [esams, eqiad, codfw, ulsfo, eqsin], # Oman
+ PH => [ulsfo, codfw, eqiad, esams, eqsin], # Philippines
+ PK => [esams, eqiad, codfw, ulsfo, eqsin], # Pakistan
+ PS => [esams, eqiad, codfw, ulsfo, eqsin], # Palestine, State of
+ QA => [esams, eqiad, codfw, ulsfo, eqsin], # Qatar
+ SA => [esams, eqiad, codfw, ulsfo, eqsin], # Saudi Arabia
+ SG => [ulsfo, codfw, eqiad, esams, eqsin], # Singapore
+ SY => [esams, eqiad, codfw, ulsfo, eqsin], # Syrian Arab Republic
+ TH => [ulsfo, codfw, eqiad, esams, eqsin], # Thailand
+ TJ => [esams, eqiad, codfw, ulsfo, eqsin], # Tajikistan
+ TL => [ulsfo, codfw, eqiad, esams, eqsin], # Timor-Leste
+ TM => [esams, eqiad, codfw, ulsfo, eqsin], # Turkmenistan
+ TW => [ulsfo, codfw, eqiad, esams, eqsin], # Taiwan, Province of
China
+ UZ => [esams, eqiad, codfw, ulsfo, eqsin], # Uzbekistan
+ VN => [ulsfo, codfw, eqiad, esams, eqsin], # Viet Nam
+ YE => [esams, eqiad, codfw, ulsfo, eqsin], # Yemen
},
EU => {
- default => [esams, eqiad, codfw, ulsfo],
- AD => [esams, eqiad, codfw, ulsfo], # Andorra
- AL => [esams, eqiad, codfw, ulsfo], # Albania
- AT => [esams, eqiad, codfw, ulsfo], # Austria
- AX => [esams, eqiad, codfw, ulsfo], # Åland Islands
- BA => [esams, eqiad, codfw, ulsfo], # Bosnia and Herzegowina
- BE => [esams, eqiad, codfw, ulsfo], # Belgium
- BG => [esams, eqiad, codfw, ulsfo], # Bulgaria
- BY => [esams, eqiad, codfw, ulsfo], # Belarus
- CH => [esams, eqiad, codfw, ulsfo], # Switzerland
- CZ => [esams, eqiad, codfw, ulsfo], # Czech Republic
- DE => [esams, eqiad, codfw, ulsfo], # Germany
- DK => [esams, eqiad, codfw, ulsfo], # Denmark
- EE => [esams, eqiad, codfw, ulsfo], # Estonia
- ES => [esams, eqiad, codfw, ulsfo], # Spain
- EU => [esams, eqiad, codfw, ulsfo], # Europe region (misc)
- FI => [esams, eqiad, codfw, ulsfo], # Finland
- FO => [esams, eqiad, codfw, ulsfo], # Faroe Islands
- FR => [esams, eqiad, codfw, ulsfo], # France
- GB => [esams, eqiad, codfw, ulsfo], # United Kingdom
- GG => [esams, eqiad, codfw, ulsfo], # Guernsey
- GI => [esams, eqiad, codfw, ulsfo], # Gibraltar
- GR => [esams, eqiad, codfw, ulsfo], # Greece
- HR => [esams, eqiad, codfw, ulsfo], # Croatia (local name Hrvatska)
- HU => [esams, eqiad, codfw, ulsfo], # Hungary
- IE => [esams, eqiad, codfw, ulsfo], # Ireland
- IM => [esams, eqiad, codfw, ulsfo], # Isle of Man
- IS => [esams, eqiad, codfw, ulsfo], # Iceland
- IT => [esams, eqiad, codfw, ulsfo], # Italy
- JE => [esams, eqiad, codfw, ulsfo], # Jersey
- LI => [esams, eqiad, codfw, ulsfo], # Liechtenstein
- LT => [esams, eqiad, codfw, ulsfo], # Lithuania
- LU => [esams, eqiad, codfw, ulsfo], # Luxembourg
- LV => [esams, eqiad, codfw, ulsfo], # Latvia
- MC => [esams, eqiad, codfw, ulsfo], # Monaco
- MD => [esams, eqiad, codfw, ulsfo], # Moldova, Republic of
- ME => [esams, eqiad, codfw, ulsfo], # Montenegro
- MK => [esams, eqiad, codfw, ulsfo], # Macedonia, the Former
Yugoslav Republic of
- MT => [esams, eqiad, codfw, ulsfo], # Malta
- NL => [esams, eqiad, codfw, ulsfo], # Netherlands
- NO => [esams, eqiad, codfw, ulsfo], # Norway
- PL => [esams, eqiad, codfw, ulsfo], # Poland
- PT => [esams, eqiad, codfw, ulsfo], # Portugal
- RO => [esams, eqiad, codfw, ulsfo], # Romania
- RS => [esams, eqiad, codfw, ulsfo], # Serbia
- RU => [esams, eqiad, codfw, ulsfo], # Russian Federation
- SE => [esams, eqiad, codfw, ulsfo], # Sweden
- SI => [esams, eqiad, codfw, ulsfo], # Slovenia
- SJ => [esams, eqiad, codfw, ulsfo], # Svalbard and Jan Mayen
Islands
- SK => [esams, eqiad, codfw, ulsfo], # Slovakia
- SM => [esams, eqiad, codfw, ulsfo], # San Marino
- TR => [esams, eqiad, codfw, ulsfo], # Turkey
- UA => [esams, eqiad, codfw, ulsfo], # Ukraine
- VA => [esams, eqiad, codfw, ulsfo], # Holy See (Vatican City State)
+ default => [esams, eqiad, codfw, ulsfo, eqsin],
+ AD => [esams, eqiad, codfw, ulsfo, eqsin], # Andorra
+ AL => [esams, eqiad, codfw, ulsfo, eqsin], # Albania
+ AT => [esams, eqiad, codfw, ulsfo, eqsin], # Austria
+ AX => [esams, eqiad, codfw, ulsfo, eqsin], # Åland Islands
+ BA => [esams, eqiad, codfw, ulsfo, eqsin], # Bosnia and Herzegowina
+ BE => [esams, eqiad, codfw, ulsfo, eqsin], # Belgium
+ BG => [esams, eqiad, codfw, ulsfo, eqsin], # Bulgaria
+ BY => [esams, eqiad, codfw, ulsfo, eqsin], # Belarus
+ CH => [esams, eqiad, codfw, ulsfo, eqsin], # Switzerland
+ CZ => [esams, eqiad, codfw, ulsfo, eqsin], # Czech Republic
+ DE => [esams, eqiad, codfw, ulsfo, eqsin], # Germany
+ DK => [esams, eqiad, codfw, ulsfo, eqsin], # Denmark
+ EE => [esams, eqiad, codfw, ulsfo, eqsin], # Estonia
+ ES => [esams, eqiad, codfw, ulsfo, eqsin], # Spain
+ EU => [esams, eqiad, codfw, ulsfo, eqsin], # Europe region (misc)
+ FI => [esams, eqiad, codfw, ulsfo, eqsin], # Finland
+ FO => [esams, eqiad, codfw, ulsfo, eqsin], # Faroe Islands
+ FR => [esams, eqiad, codfw, ulsfo, eqsin], # France
+ GB => [esams, eqiad, codfw, ulsfo, eqsin], # United Kingdom
+ GG => [esams, eqiad, codfw, ulsfo, eqsin], # Guernsey
+ GI => [esams, eqiad, codfw, ulsfo, eqsin], # Gibraltar
+ GR => [esams, eqiad, codfw, ulsfo, eqsin], # Greece
+ HR => [esams, eqiad, codfw, ulsfo, eqsin], # Croatia (local name
Hrvatska)
+ HU => [esams, eqiad, codfw, ulsfo, eqsin], # Hungary
+ IE => [esams, eqiad, codfw, ulsfo, eqsin], # Ireland
+ IM => [esams, eqiad, codfw, ulsfo, eqsin], # Isle of Man
+ IS => [esams, eqiad, codfw, ulsfo, eqsin], # Iceland
+ IT => [esams, eqiad, codfw, ulsfo, eqsin], # Italy
+ JE => [esams, eqiad, codfw, ulsfo, eqsin], # Jersey
+ LI => [esams, eqiad, codfw, ulsfo, eqsin], # Liechtenstein
+ LT => [esams, eqiad, codfw, ulsfo, eqsin], # Lithuania
+ LU => [esams, eqiad, codfw, ulsfo, eqsin], # Luxembourg
+ LV => [esams, eqiad, codfw, ulsfo, eqsin], # Latvia
+ MC => [esams, eqiad, codfw, ulsfo, eqsin], # Monaco
+ MD => [esams, eqiad, codfw, ulsfo, eqsin], # Moldova, Republic of
+ ME => [esams, eqiad, codfw, ulsfo, eqsin], # Montenegro
+ MK => [esams, eqiad, codfw, ulsfo, eqsin], # Macedonia, the Former
Yugoslav Republic of
+ MT => [esams, eqiad, codfw, ulsfo, eqsin], # Malta
+ NL => [esams, eqiad, codfw, ulsfo, eqsin], # Netherlands
+ NO => [esams, eqiad, codfw, ulsfo, eqsin], # Norway
+ PL => [esams, eqiad, codfw, ulsfo, eqsin], # Poland
+ PT => [esams, eqiad, codfw, ulsfo, eqsin], # Portugal
+ RO => [esams, eqiad, codfw, ulsfo, eqsin], # Romania
+ RS => [esams, eqiad, codfw, ulsfo, eqsin], # Serbia
+ RU => [esams, eqiad, codfw, ulsfo, eqsin], # Russian Federation
+ SE => [esams, eqiad, codfw, ulsfo, eqsin], # Sweden
+ SI => [esams, eqiad, codfw, ulsfo, eqsin], # Slovenia
+ SJ => [esams, eqiad, codfw, ulsfo, eqsin], # Svalbard and Jan
Mayen Islands
+ SK => [esams, eqiad, codfw, ulsfo, eqsin], # Slovakia
+ SM => [esams, eqiad, codfw, ulsfo, eqsin], # San Marino
+ TR => [esams, eqiad, codfw, ulsfo, eqsin], # Turkey
+ UA => [esams, eqiad, codfw, ulsfo, eqsin], # Ukraine
+ VA => [esams, eqiad, codfw, ulsfo, eqsin], # Holy See (Vatican
City State)
},
NA => {
US => { # United States of America
- AK => [ulsfo, codfw, eqiad, esams], # Alaska
- AL => [codfw, eqiad, ulsfo, esams], # Alabama
- AR => [codfw, eqiad, ulsfo, esams], # Arkansas
- AZ => [ulsfo, codfw, eqiad, esams], # Arizona
- CA => [ulsfo, codfw, eqiad, esams], # California
- CO => [codfw, eqiad, ulsfo, esams], # Colorado
- CT => [eqiad, codfw, ulsfo, esams], # Connecticut
- DC => [eqiad, codfw, ulsfo, esams], # District of Columbia
- DE => [eqiad, codfw, ulsfo, esams], # Delaware
- FL => [eqiad, codfw, ulsfo, esams], # Florida
- GA => [eqiad, codfw, ulsfo, esams], # Georgia
- HI => [ulsfo, codfw, eqiad, esams], # Hawaii
- IA => [codfw, eqiad, ulsfo, esams], # Iowa
- ID => [ulsfo, codfw, eqiad, esams], # Idaho
- IL => [eqiad, codfw, ulsfo, esams], # Illinois
- IN => [eqiad, codfw, ulsfo, esams], # Indiana
- KS => [codfw, eqiad, ulsfo, esams], # Kansas
- KY => [eqiad, codfw, ulsfo, esams], # Kentucky
- LA => [codfw, eqiad, ulsfo, esams], # Louisiana
- MA => [eqiad, codfw, ulsfo, esams], # Massachusetts
- MD => [eqiad, codfw, ulsfo, esams], # Maryland
- ME => [eqiad, codfw, ulsfo, esams], # Maine
- MI => [eqiad, codfw, ulsfo, esams], # Michigan
- MN => [codfw, eqiad, ulsfo, esams], # Minnesota
- MO => [codfw, eqiad, ulsfo, esams], # Missouri
- MS => [codfw, eqiad, ulsfo, esams], # Mississippi
- MT => [ulsfo, codfw, eqiad, esams], # Montana
- NC => [eqiad, codfw, ulsfo, esams], # North Carolina
- ND => [codfw, eqiad, ulsfo, esams], # North Dakota
- NE => [codfw, eqiad, ulsfo, esams], # Nebraska
- NH => [eqiad, codfw, ulsfo, esams], # New Hampshire
- NJ => [eqiad, codfw, ulsfo, esams], # New Jersey
- NM => [codfw, eqiad, ulsfo, esams], # New Mexico
- NV => [ulsfo, codfw, eqiad, esams], # Nevada
- NY => [eqiad, codfw, ulsfo, esams], # New York
- OH => [eqiad, codfw, ulsfo, esams], # Ohio
- OK => [codfw, eqiad, ulsfo, esams], # Oklahoma
- OR => [ulsfo, codfw, eqiad, esams], # Oregon
- PA => [eqiad, codfw, ulsfo, esams], # Pennsylvania
- RI => [eqiad, codfw, ulsfo, esams], # Rhode Island
- SC => [eqiad, codfw, ulsfo, esams], # South Carolina
- SD => [codfw, eqiad, ulsfo, esams], # South Dakota
- TN => [eqiad, codfw, ulsfo, esams], # Tennessee
- TX => [codfw, eqiad, ulsfo, esams], # Texas
- UT => [ulsfo, codfw, eqiad, esams], # Utah
- VA => [eqiad, codfw, ulsfo, esams], # Virginia
- VT => [eqiad, codfw, ulsfo, esams], # Vermont
- WA => [ulsfo, codfw, eqiad, esams], # Washington
- WI => [eqiad, codfw, ulsfo, esams], # Wisconsin
- WV => [eqiad, codfw, ulsfo, esams], # West Virginia
- WY => [ulsfo, codfw, eqiad, esams], # Wyoming
+ AK => [ulsfo, codfw, eqiad, esams, eqsin], # Alaska
+ AL => [codfw, eqiad, ulsfo, esams, eqsin], # Alabama
+ AR => [codfw, eqiad, ulsfo, esams, eqsin], # Arkansas
+ AZ => [ulsfo, codfw, eqiad, esams, eqsin], # Arizona
+ CA => [ulsfo, codfw, eqiad, esams, eqsin], # California
+ CO => [codfw, eqiad, ulsfo, esams, eqsin], # Colorado
+ CT => [eqiad, codfw, ulsfo, esams, eqsin], # Connecticut
+ DC => [eqiad, codfw, ulsfo, esams, eqsin], # District of
Columbia
+ DE => [eqiad, codfw, ulsfo, esams, eqsin], # Delaware
+ FL => [eqiad, codfw, ulsfo, esams, eqsin], # Florida
+ GA => [eqiad, codfw, ulsfo, esams, eqsin], # Georgia
+ HI => [ulsfo, codfw, eqiad, esams, eqsin], # Hawaii
+ IA => [codfw, eqiad, ulsfo, esams, eqsin], # Iowa
+ ID => [ulsfo, codfw, eqiad, esams, eqsin], # Idaho
+ IL => [eqiad, codfw, ulsfo, esams, eqsin], # Illinois
+ IN => [eqiad, codfw, ulsfo, esams, eqsin], # Indiana
+ KS => [codfw, eqiad, ulsfo, esams, eqsin], # Kansas
+ KY => [eqiad, codfw, ulsfo, esams, eqsin], # Kentucky
+ LA => [codfw, eqiad, ulsfo, esams, eqsin], # Louisiana
+ MA => [eqiad, codfw, ulsfo, esams, eqsin], # Massachusetts
+ MD => [eqiad, codfw, ulsfo, esams, eqsin], # Maryland
+ ME => [eqiad, codfw, ulsfo, esams, eqsin], # Maine
+ MI => [eqiad, codfw, ulsfo, esams, eqsin], # Michigan
+ MN => [codfw, eqiad, ulsfo, esams, eqsin], # Minnesota
+ MO => [codfw, eqiad, ulsfo, esams, eqsin], # Missouri
+ MS => [codfw, eqiad, ulsfo, esams, eqsin], # Mississippi
+ MT => [ulsfo, codfw, eqiad, esams, eqsin], # Montana
+ NC => [eqiad, codfw, ulsfo, esams, eqsin], # North Carolina
+ ND => [codfw, eqiad, ulsfo, esams, eqsin], # North Dakota
+ NE => [codfw, eqiad, ulsfo, esams, eqsin], # Nebraska
+ NH => [eqiad, codfw, ulsfo, esams, eqsin], # New Hampshire
+ NJ => [eqiad, codfw, ulsfo, esams, eqsin], # New Jersey
+ NM => [codfw, eqiad, ulsfo, esams, eqsin], # New Mexico
+ NV => [ulsfo, codfw, eqiad, esams, eqsin], # Nevada
+ NY => [eqiad, codfw, ulsfo, esams, eqsin], # New York
+ OH => [eqiad, codfw, ulsfo, esams, eqsin], # Ohio
+ OK => [codfw, eqiad, ulsfo, esams, eqsin], # Oklahoma
+ OR => [ulsfo, codfw, eqiad, esams, eqsin], # Oregon
+ PA => [eqiad, codfw, ulsfo, esams, eqsin], # Pennsylvania
+ RI => [eqiad, codfw, ulsfo, esams, eqsin], # Rhode Island
+ SC => [eqiad, codfw, ulsfo, esams, eqsin], # South Carolina
+ SD => [codfw, eqiad, ulsfo, esams, eqsin], # South Dakota
+ TN => [eqiad, codfw, ulsfo, esams, eqsin], # Tennessee
+ TX => [codfw, eqiad, ulsfo, esams, eqsin], # Texas
+ UT => [ulsfo, codfw, eqiad, esams, eqsin], # Utah
+ VA => [eqiad, codfw, ulsfo, esams, eqsin], # Virginia
+ VT => [eqiad, codfw, ulsfo, esams, eqsin], # Vermont
+ WA => [ulsfo, codfw, eqiad, esams, eqsin], # Washington
+ WI => [eqiad, codfw, ulsfo, esams, eqsin], # Wisconsin
+ WV => [eqiad, codfw, ulsfo, esams, eqsin], # West Virginia
+ WY => [ulsfo, codfw, eqiad, esams, eqsin], # Wyoming
},
CA => { # Canada
- AB => [ulsfo, codfw, eqiad, esams], # Alberta
- BC => [ulsfo, codfw, eqiad, esams], # British Columbia
- MB => [eqiad, codfw, ulsfo, esams], # Manitoba
- NB => [eqiad, codfw, ulsfo, esams], # New Brunswick
- NL => [eqiad, codfw, ulsfo, esams], # Newfoundland
- NS => [eqiad, codfw, ulsfo, esams], # Nova Scotia
- NT => [ulsfo, codfw, eqiad, esams], # Northwest Territories
- NU => [eqiad, codfw, ulsfo, esams], # Nunavut
- ON => [eqiad, codfw, ulsfo, esams], # Ontario
- PE => [eqiad, codfw, ulsfo, esams], # Prince Edward Island
- QC => [eqiad, codfw, ulsfo, esams], # Quebec
- SK => [eqiad, codfw, ulsfo, esams], # Saskatchewan
- YT => [ulsfo, codfw, eqiad, esams], # Yukon Territory
+ AB => [ulsfo, codfw, eqiad, esams, eqsin], # Alberta
+ BC => [ulsfo, codfw, eqiad, esams, eqsin], # British Columbia
+ MB => [eqiad, codfw, ulsfo, esams, eqsin], # Manitoba
+ NB => [eqiad, codfw, ulsfo, esams, eqsin], # New Brunswick
+ NL => [eqiad, codfw, ulsfo, esams, eqsin], # Newfoundland
+ NS => [eqiad, codfw, ulsfo, esams, eqsin], # Nova Scotia
+ NT => [ulsfo, codfw, eqiad, esams, eqsin], # Northwest
Territories
+ NU => [eqiad, codfw, ulsfo, esams, eqsin], # Nunavut
+ ON => [eqiad, codfw, ulsfo, esams, eqsin], # Ontario
+ PE => [eqiad, codfw, ulsfo, esams, eqsin], # Prince Edward
Island
+ QC => [eqiad, codfw, ulsfo, esams, eqsin], # Quebec
+ SK => [eqiad, codfw, ulsfo, esams, eqsin], # Saskatchewan
+ YT => [ulsfo, codfw, eqiad, esams, eqsin], # Yukon Territory
},
- MX => [codfw, eqiad, ulsfo, esams], # Mexico
+ MX => [codfw, eqiad, ulsfo, esams, eqsin], # Mexico
},
- OC => [ulsfo, codfw, eqiad, esams],
- default => [eqiad, codfw, ulsfo, esams],
+ OC => [ulsfo, codfw, eqiad, esams, eqsin],
+ default => [eqiad, codfw, ulsfo, esams, eqsin],
},
nets = {
# Wikimedia address space
- 208.80.152.0/23 => [codfw, eqiad, ulsfo, esams], # codfw
- 208.80.154.0/23 => [eqiad, codfw, ulsfo, esams], # eqiad
- 91.198.174.0/24 => [esams, eqiad, codfw, ulsfo], # esams
- 185.15.56.0/22 => [esams, eqiad, codfw, ulsfo], # esams
- 198.35.26.0/23 => [ulsfo, codfw, eqiad, esams], # ulsfo
- 2620:0:860::/48 => [codfw, eqiad, ulsfo, esams], # codfw
- 2620:0:861::/48 => [eqiad, codfw, ulsfo, esams], # eqiad
- 2620:0:862::/48 => [esams, eqiad, codfw, ulsfo], # esams
- 2620:0:863::/48 => [ulsfo, codfw, eqiad, esams], # ulsfo
- 198.73.209.0/24 => [ulsfo, codfw, eqiad, esams], # WMF OIT
- 2620:62:c000::/48 => [ulsfo, codfw, eqiad, esams], # WMF OIT
+ 208.80.152.0/23 => [codfw, eqiad, ulsfo, esams, eqsin], # codfw
+ 208.80.154.0/23 => [eqiad, codfw, ulsfo, esams, eqsin], # eqiad
+ 91.198.174.0/24 => [esams, eqiad, codfw, ulsfo, eqsin], # esams
+ 185.15.56.0/22 => [esams, eqiad, codfw, ulsfo, eqsin], # esams
+ 198.35.26.0/23 => [ulsfo, codfw, eqiad, esams, eqsin], # ulsfo
+ 2620:0:860::/48 => [codfw, eqiad, ulsfo, esams, eqsin], # codfw
+ 2620:0:861::/48 => [eqiad, codfw, ulsfo, esams, eqsin], # eqiad
+ 2620:0:862::/48 => [esams, eqiad, codfw, ulsfo, eqsin], # esams
+ 2620:0:863::/48 => [ulsfo, codfw, eqiad, esams, eqsin], # ulsfo
+ 198.73.209.0/24 => [ulsfo, codfw, eqiad, esams, eqsin], # WMF OIT
+ 2620:62:c000::/48 => [ulsfo, codfw, eqiad, esams, eqsin], # WMF OIT
# Wikimedia 10/8 private space
- 10.2.1.0/24 => [codfw, eqiad, ulsfo, esams], # codfw LVS
- 10.2.2.0/24 => [eqiad, codfw, ulsfo, esams], # eqiad LVS
- 10.2.3.0/24 => [esams, eqiad, codfw, ulsfo], # esams LVS
- 10.2.4.0/24 => [ulsfo, codfw, eqiad, esams], # ulsfo LVS
- 10.20.0.0/23 => [esams, eqiad, codfw, ulsfo], # esams private/mgmt
- 10.64.0.0/12 => [eqiad, codfw, ulsfo, esams], # eqiad private/mgmt
- 10.128.0.0/16 => [ulsfo, codfw, eqiad, esams], # ulsfo private/mgmt
- 10.192.0.0/12 => [codfw, eqiad, ulsfo, esams], # codfw private/mgmt
+ 10.2.1.0/24 => [codfw, eqiad, ulsfo, esams, eqsin], # codfw LVS
+ 10.2.2.0/24 => [eqiad, codfw, ulsfo, esams, eqsin], # eqiad LVS
+ 10.2.3.0/24 => [esams, eqiad, codfw, ulsfo, eqsin], # esams LVS
+ 10.2.4.0/24 => [ulsfo, codfw, eqiad, esams, eqsin], # ulsfo LVS
+ 10.20.0.0/23 => [esams, eqiad, codfw, ulsfo, eqsin], # esams
private/mgmt
+ 10.64.0.0/12 => [eqiad, codfw, ulsfo, esams, eqsin], # eqiad
private/mgmt
+ 10.128.0.0/16 => [ulsfo, codfw, eqiad, esams, eqsin], # ulsfo
private/mgmt
+ 10.192.0.0/12 => [codfw, eqiad, ulsfo, esams, eqsin], # codfw
private/mgmt
# Level3's DNS clusters
- 192.221.132.0/22 => [eqiad, codfw, ulsfo, esams], # Atlanta
- 192.221.136.0/22 => [eqiad, codfw, ulsfo, esams], # Chicago
- 192.221.140.0/22 => [codfw, eqiad, ulsfo, esams], # Dallas
- 192.221.148.0/22 => [ulsfo, codfw, eqiad, esams], # Los Angeles
- 192.221.156.0/22 => [eqiad, codfw, ulsfo, esams], # New York
- 192.221.160.0/22 => [ulsfo, codfw, eqiad, esams], # San Jose
- 192.221.164.0/22 => [eqiad, codfw, ulsfo, esams], # Washington, DC
- 8.0.4.0/22 => [eqiad, codfw, ulsfo, esams], # Atlanta
- 8.0.8.0/22 => [eqiad, codfw, ulsfo, esams], # Chicago
- 8.0.12.0/22 => [codfw, eqiad, ulsfo, esams], # Dallas
- 8.0.20.0/22 => [ulsfo, codfw, eqiad, esams], # Los Angeles
- 8.0.28.0/22 => [eqiad, codfw, ulsfo, esams], # New York
- 8.0.32.0/22 => [ulsfo, codfw, eqiad, esams], # San Jose
- 8.0.36.0/22 => [eqiad, codfw, ulsfo, esams], # Washington, DC
+ 192.221.132.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # Atlanta
+ 192.221.136.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # Chicago
+ 192.221.140.0/22 => [codfw, eqiad, ulsfo, esams, eqsin], # Dallas
+ 192.221.148.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # Los Angeles
+ 192.221.156.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # New York
+ 192.221.160.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # San Jose
+ 192.221.164.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], #
Washington, DC
+ 8.0.4.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # Atlanta
+ 8.0.8.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # Chicago
+ 8.0.12.0/22 => [codfw, eqiad, ulsfo, esams, eqsin], # Dallas
+ 8.0.20.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # Los Angeles
+ 8.0.28.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], # New York
+ 8.0.32.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # San Jose
+ 8.0.36.0/22 => [eqiad, codfw, ulsfo, esams, eqsin], #
Washington, DC
# AT&T's DNS clusters (incomplete)
- 151.164.0.0/16 => [ulsfo, codfw, eqiad, esams], # West Coast?
- 12.121.112.0/22 => [ulsfo, codfw, eqiad, esams], # West Coast?
+ 151.164.0.0/16 => [ulsfo, codfw, eqiad, esams, eqsin], # West Coast?
+ 12.121.112.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # West Coast?
},
}
diff --git a/geo-resources b/geo-resources
index 392884f..d07419d 100644
--- a/geo-resources
+++ b/geo-resources
@@ -6,6 +6,10 @@
codfw => { addrs_v4 => 208.80.153.224, addrs_v6 => 2620:0: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 }
+ # eqsin using ulsfo IPs temporarily for testing/validation, site not
ready yet
+ # real addresses for future use:
+ # eqsin => { addrs_v4 => 103.102.166.224, addrs_v6 =>
2001:0df2:e500:ed1a::1 }
+ eqsin => { addrs_v4 => 198.35.26.96, addrs_v6 => 2620:0:863:ed1a::1 }
}
}
upload-addrs => {
@@ -16,6 +20,10 @@
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 }
+ # eqsin using ulsfo IPs temporarily for testing/validation, site not
ready yet
+ # real addresses for future use:
+ # eqsin => { addrs_v4 => 103.102.166.240, addrs_v6 =>
2001:0df2:e500:ed1a::2:b }
+ eqsin => { addrs_v4 => 198.35.26.112, addrs_v6 =>
2620:0:863:ed1a::2:b }
}
}
misc-addrs => {
@@ -27,5 +35,6 @@
esams => { addrs_v4 => 91.198.174.217, addrs_v6 =>
2620:0:862:ed1a::3:d }
# T164610 - using codfw IPs here until T164609, also downed in
admin_state to avoid confusion
ulsfo => { addrs_v4 => 208.80.153.248, addrs_v6 =>
2620:0:860:ed1a::3:d }
+ eqsin => { addrs_v4 => 208.80.153.248, addrs_v6 =>
2620:0:860:ed1a::3:d }
}
}
diff --git a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
index ba02b4e..9a2751b 100644
--- a/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
+++ b/templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
@@ -20,9 +20,26 @@
; 2001:0df2:e500:1::/64 - public1-eqsin
$ORIGIN 1.0.0.0.{{ zonename }}.
+7.0.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR bast5001.wikimedia.org.
+8.0.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR dns5001.wikimedia.org.
+9.0.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR dns5002.wikimedia.org.
+
; 2001:0df2:e500:100::/56 - eqsin private subnets
; 2001:0df2:e500:101::/64 - private1-eqsin
$ORIGIN 1.0.1.0.{{ zonename }}.
+
+1.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5001.eqsin.wmnet.
+2.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5002.eqsin.wmnet.
+3.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5003.eqsin.wmnet.
+4.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5004.eqsin.wmnet.
+5.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5005.eqsin.wmnet.
+6.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5006.eqsin.wmnet.
+7.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5007.eqsin.wmnet.
+8.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5008.eqsin.wmnet.
+9.0.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5009.eqsin.wmnet.
+0.1.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5010.eqsin.wmnet.
+1.1.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5011.eqsin.wmnet.
+2.1.1.0.0.0.0.0.8.2.1.0.0.1.0.0 1H IN PTR cp5012.eqsin.wmnet.
; 2001:0df2:e500:200::/56 - eqsin sandbox subnets
; 2001:0df2:e500:201::/64 - sandbox1-eqsin
@@ -34,9 +51,16 @@
; - 2001:0df2:e500:ed1a::0:0/110 (::0:0 - ::3:ffff -- LVS Public Service IPs
(in use)
; -- 2001:0df2:e500:ed1a::0:0/111 (::0:0 - ::1:ffff --- LVS high-traffic1
(Text)
$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.eqsin.wikimedia.org.
+
$ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
+
; -- 2001:0df2:e500:ed1a::2:0/111 (::2:0 - ::3:ffff --- LVS high-traffic2
(Multimedia & Misc)
$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.eqsin.wikimedia.org.
+
$ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
; 2001:0df2:e500:fe00::/56 - Infrastructure IPs
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index bb9fcb8..6fa5cc7 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -95,6 +95,10 @@
$ORIGIN 4.2.{{ zonename }}.
+; 10.2.5.0/24 - eqsin LVS low-traffic (internal) services
+
+$ORIGIN 5.2.{{ zonename }}.
+
;
; ESAMS
;
@@ -2904,9 +2908,46 @@
; 10.132.0.0/17 - eqsin private
; 10.132.0.0/24 - private1-eqsin
$ORIGIN 0.132.{{ zonename }}.
+11 1H IN PTR lvs5001.eqsin.wmnet.
+12 1H IN PTR lvs5002.eqsin.wmnet.
+13 1H IN PTR lvs5003.eqsin.wmnet.
+
+101 1H IN PTR cp5001.eqsin.wmnet.
+102 1H IN PTR cp5002.eqsin.wmnet.
+103 1H IN PTR cp5003.eqsin.wmnet.
+104 1H IN PTR cp5004.eqsin.wmnet.
+105 1H IN PTR cp5005.eqsin.wmnet.
+106 1H IN PTR cp5006.eqsin.wmnet.
+107 1H IN PTR cp5007.eqsin.wmnet.
+108 1H IN PTR cp5008.eqsin.wmnet.
+109 1H IN PTR cp5009.eqsin.wmnet.
+110 1H IN PTR cp5010.eqsin.wmnet.
+111 1H IN PTR cp5011.eqsin.wmnet.
+112 1H IN PTR cp5012.eqsin.wmnet.
+
; 10.132.128.0/17 - eqsin mgmt
$ORIGIN 128.132.{{ zonename }}.
$ORIGIN 129.132.{{ zonename }}.
+7 1H IN PTR bast5001.mgmt.eqsin.wmnet.
+8 1H IN PTR dns5001.mgmt.eqsin.wmnet.
+9 1H IN PTR dns5002.mgmt.eqsin.wmnet.
+
+11 1H IN PTR lvs5001.mgmt.eqsin.wmnet.
+12 1H IN PTR lvs5002.mgmt.eqsin.wmnet.
+13 1H IN PTR lvs5003.mgmt.eqsin.wmnet.
+
+101 1H IN PTR cp5001.mgmt.eqsin.wmnet.
+102 1H IN PTR cp5002.mgmt.eqsin.wmnet.
+103 1H IN PTR cp5003.mgmt.eqsin.wmnet.
+104 1H IN PTR cp5004.mgmt.eqsin.wmnet.
+105 1H IN PTR cp5005.mgmt.eqsin.wmnet.
+106 1H IN PTR cp5006.mgmt.eqsin.wmnet.
+107 1H IN PTR cp5007.mgmt.eqsin.wmnet.
+108 1H IN PTR cp5008.mgmt.eqsin.wmnet.
+109 1H IN PTR cp5009.mgmt.eqsin.wmnet.
+110 1H IN PTR cp5010.mgmt.eqsin.wmnet.
+111 1H IN PTR cp5011.mgmt.eqsin.wmnet.
+112 1H IN PTR cp5012.mgmt.eqsin.wmnet.
;
; CODFW (10.192.0.0/12)
diff --git a/templates/166.102.103.in-addr.arpa
b/templates/166.102.103.in-addr.arpa
index 34bdc9c..fdba2c0 100644
--- a/templates/166.102.103.in-addr.arpa
+++ b/templates/166.102.103.in-addr.arpa
@@ -17,6 +17,11 @@
; APNIC space, reserved for eqsin
; 103.102.166.0/28 (0-15) - public1-eqsin
+
+7 1H IN PTR bast5001.wikimedia.org.
+8 1H IN PTR dns5001.wikimedia.org.
+9 1H IN PTR dns5002.wikimedia.org.
+
; 103.102.166.16/28 (16-31) - sandbox1-eqsin
20 1H IN PTR ripe-atlas-eqsin.wikimedia.org.
@@ -28,4 +33,9 @@
; 103.102.166.192/27 (192-223) - unused
; 103.102.166.224/27 (224-255) - LVS Service IPs
; - 103.102.166.224/28 (224-239) -- LVS high-traffic1 (Text)
+
+224 1H IN PTR text-lb.eqsin.wikimedia.org.
+
; - 103.102.166.240/28 (240-255) -- high-traffic2 (Multimedia & Misc)
+
+240 1H IN PTR upload-lb.eqsin.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 5bbba63..bd3eea3 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -146,6 +146,8 @@
bast4001 1H IN AAAA 2620:0:863:1:198:35:26:5
bast4002 1H IN A 198.35.26.6
bast4002 1H IN AAAA 2620:0:863:1:198:35:26:6
+bast5001 1H IN A 103.102.166.7
+bast5001 1H IN AAAA 2001:0df2:e500:1:103:102:166:7
californium 1H IN A 208.80.154.147
californium 1H IN AAAA 2620:0:861:2:208:80:154:147
chromium 1H IN A 208.80.154.157
@@ -157,6 +159,10 @@
contint2001 1H IN A 208.80.153.15
contint2001 1H IN AAAA 2620:0:860:1:208:80:153:15
diadem 1H IN A 208.80.153.17
+dns5001 1H IN A 103.102.166.8
+dns5001 1H IN AAAA 2001:0df2:e500:1:103:102:166:8
+dns5002 1H IN A 103.102.166.9
+dns5002 1H IN AAAA 2001:0df2:e500:1:103:102:166:9
dubnium 1H IN A 208.80.154.13
dysprosium 1H IN A 208.80.154.24
cp1008 1H IN A 208.80.154.42
@@ -311,6 +317,16 @@
1H IN MX 10 mx1001
1H IN MX 50 mx2001
+;;; eqsin
+text-lb.eqsin 600 IN DYNA geoip!text-addrs/eqsin
+upload-lb.eqsin 600 IN DYNA geoip!upload-addrs/eqsin
+maps-lb.eqsin 600 IN DYNA geoip!upload-addrs/eqsin
+; T164610 - semi-permanent to avoid confusion until T164609
+misc-web-lb.eqsin 600 IN DYNA geoip!misc-addrs/codfw
+donate-lb.eqsin 600 IN DYNA geoip!text-addrs/eqsin
+ 1H IN MX 10 mx1001
+ 1H IN MX 50 mx2001
+
;;; codfw
dns-rec-lb.codfw 1H IN A 208.80.153.254
1H IN AAAA 2620:0:860:ed1a::3:fe
diff --git a/templates/wmnet b/templates/wmnet
index a48f1cd..c5d121d 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4675,6 +4675,96 @@
_x-puppet-ca._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet.
_x-puppet._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet.
+;
+; EQSIN MGMT
+;
+
+$ORIGIN mgmt.eqsin.wmnet.
+
+; Servers listed sequentially
+bast5001 1H IN A 10.132.129.7
+dns5001 1H IN A 10.132.129.8
+dns5002 1H IN A 10.132.129.9
+
+lvs5001 1H IN A 10.132.129.11
+lvs5002 1H IN A 10.132.129.12
+lvs5003 1H IN A 10.132.129.13
+
+cp5001 1H IN A 10.132.129.101
+cp5002 1H IN A 10.132.129.102
+cp5003 1H IN A 10.132.129.103
+cp5004 1H IN A 10.132.129.104
+cp5005 1H IN A 10.132.129.105
+cp5006 1H IN A 10.132.129.106
+cp5007 1H IN A 10.132.129.107
+cp5008 1H IN A 10.132.129.108
+cp5009 1H IN A 10.132.129.109
+cp5010 1H IN A 10.132.129.110
+cp5011 1H IN A 10.132.129.111
+cp5012 1H IN A 10.132.129.112
+
+
+; Asset tags listed in order
+
+
+;
+; EQSIN private1
+;
+
+$ORIGIN eqsin.wmnet.
+
+; Servers listed sequentially
+lvs5001 1H IN A 10.132.0.11
+lvs5002 1H IN A 10.132.0.12
+lvs5003 1H IN A 10.132.0.13
+
+cp5001 1H IN A 10.132.0.101
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:101
+cp5002 1H IN A 10.132.0.102
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:102
+cp5003 1H IN A 10.132.0.103
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:103
+cp5004 1H IN A 10.132.0.104
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:104
+cp5005 1H IN A 10.132.0.105
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:105
+cp5006 1H IN A 10.132.0.106
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:106
+cp5007 1H IN A 10.132.0.107
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:107
+cp5008 1H IN A 10.132.0.108
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:108
+cp5009 1H IN A 10.132.0.109
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:109
+cp5010 1H IN A 10.132.0.110
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:110
+cp5011 1H IN A 10.132.0.111
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:111
+cp5012 1H IN A 10.132.0.112
+ 1H IN AAAA 2001:0df2:e500:101:10:132:0:112
+
+;
+; SERVICES
+;
+config-master 1H IN CNAME puppetmaster1001.eqiad.wmnet.
+; Temporarily depool codfw puppet T177254
+puppet 5M IN CNAME puppetmaster1001.eqiad.wmnet.
+webproxy 5M IN CNAME install2002.wikimedia.org.
+
+; etcd client discovery (RO)
+_etcd._tcp 5M IN SRV 0 1 2379 conf2001.codfw.wmnet.
+_etcd._tcp 5M IN SRV 0 1 2379 conf2002.codfw.wmnet.
+_etcd._tcp 5M IN SRV 0 1 2379 conf2003.codfw.wmnet.
+
+; Conftool (RW)
+_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1001.eqiad.wmnet.
+_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet.
+_etcd._tcp.conftool 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet.
+
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 puppetmaster1001.eqiad.wmnet.
+
; EQIAD SERVICES
$ORIGIN svc.eqiad.wmnet.
@@ -4735,6 +4825,12 @@
; Used for consistency with eqiad/codfw
prometheus 1H IN CNAME bast4001.wikimedia.org.
+; EQSIN SERVICES
+
+$ORIGIN svc.eqsin.wmnet.
+; Used for consistency with eqiad/codfw
+prometheus 1H IN CNAME bast5001.wikimedia.org.
+
; CODFW SERVICES
$ORIGIN svc.codfw.wmnet.
--
To view, visit https://gerrit.wikimedia.org/r/389739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77589bbecc1bad4e9e30ca2d692aba8a8f722d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
