BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389995 )
Change subject: eqsin v6: s/0df2/df2/ (more-canonical and shorter)
......................................................................
eqsin v6: s/0df2/df2/ (more-canonical and shorter)
(also cleaned up some arrow-alignment in geo-maps)
Bug: T156256
Change-Id: I21ddb4a68cd5fe87c87d9790a1de725eb9d26ed3
---
M geo-maps
M geo-resources
M templates/0.0.5.e.2.f.d.0.1.0.0.2.ip6.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 70 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/95/389995/1
diff --git a/geo-maps b/geo-maps
index 12e9784..d256477 100644
--- a/geo-maps
+++ b/geo-maps
@@ -193,47 +193,47 @@
},
nets = {
# Wikimedia address space
- 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
- 103.102.166.0/24 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
- 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
- 2001:0df2:e500::/48 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
- 198.73.209.0/24 => [ulsfo, codfw, eqiad, esams, eqsin], # WMF OIT
- 2620:62:c000::/48 => [ulsfo, codfw, eqiad, esams, eqsin], # 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
+ 103.102.166.0/24 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
+ 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
+ 2001:df2:e500::/48 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
+ 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, 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.2.5.0/24 => [eqsin, ulsfo, codfw, eqiad, esams], # eqsin 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.132.0.0/16 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
private/mgmt
- 10.192.0.0/12 => [codfw, eqiad, ulsfo, esams, eqsin], # 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.2.5.0/24 => [eqsin, ulsfo, codfw, eqiad, esams], # eqsin 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.132.0.0/16 => [eqsin, codfw, eqiad, ulsfo, esams], # eqsin
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, 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
+ 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, eqsin], # West Coast?
- 12.121.112.0/22 => [ulsfo, codfw, eqiad, esams, eqsin], # 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 d07419d..b750297 100644
--- a/geo-resources
+++ b/geo-resources
@@ -8,7 +8,7 @@
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 => 103.102.166.224, addrs_v6 =>
2001:df2:e500:ed1a::1 }
eqsin => { addrs_v4 => 198.35.26.96, addrs_v6 => 2620:0:863:ed1a::1 }
}
}
@@ -22,7 +22,7 @@
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 => 103.102.166.240, addrs_v6 =>
2001:df2:e500:ed1a::2:b }
eqsin => { addrs_v4 => 198.35.26.112, addrs_v6 =>
2620:0:863:ed1a::2:b }
}
}
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 9a2751b..884149b 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
@@ -13,19 +13,19 @@
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-; 2001:0df2:e500::/48
+; 2001:df2:e500::/48
; APNIC space, reserved for eqsin
-; 2001:0df2:e500:0::/56 - eqsin public subnets
-; 2001:0df2:e500:1::/64 - public1-eqsin
+; 2001:df2:e500:0::/56 - eqsin public subnets
+; 2001:df2: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
+; 2001:df2:e500:100::/56 - eqsin private subnets
+; 2001:df2: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.
@@ -41,30 +41,30 @@
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
+; 2001:df2:e500:200::/56 - eqsin sandbox subnets
+; 2001:df2:e500:201::/64 - sandbox1-eqsin
$ORIGIN 1.0.2.0.{{ zonename }}.
0.2.0.0.6.6.1.0.2.0.1.0.3.0.1.0 1H IN PTR ripe-atlas-eqsin.wikimedia.org.
-; 2001:0df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
-; - 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)
+; 2001:df2:e500:ed1a::/64 - LVS Public Service IPs (allocated)
+; - 2001:df2:e500:ed1a::0:0/110 (::0:0 - ::3:ffff -- LVS Public Service IPs
(in use)
+; -- 2001:df2: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)
+; -- 2001:df2: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
+; 2001:df2:e500:fe00::/56 - Infrastructure IPs
$ORIGIN 0.0.e.f.{{ zonename }}.
-; 2001:0df2:e500:ffff::/56 - Loopback IPs
+; 2001:df2:e500:ffff::/56 - Loopback IPs
$ORIGIN f.f.f.f.{{ zonename }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 66e9207..17e3744 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -147,7 +147,7 @@
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
+bast5001 1H IN AAAA 2001:df2: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
@@ -160,9 +160,9 @@
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
+dns5001 1H IN AAAA 2001:df2: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
+dns5002 1H IN AAAA 2001:df2: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
@@ -256,7 +256,7 @@
ripe-atlas-ulsfo 1H IN A 198.35.26.244
ripe-atlas-ulsfo 1H IN AAAA 2620:0:863:201:198:35:26:244
ripe-atlas-eqsin 1H IN A 103.102.166.20
-ripe-atlas-eqsin 1H IN AAAA 2001:0df2:e500:201:103:102:166:20
+ripe-atlas-eqsin 1H IN AAAA 2001:df2:e500:201:103:102:166:20
seaborgium 1H IN A 208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet
cluster
serpens 1H IN A 208.80.153.49 ; VM on the ganeti01.svc.codfw.wmnet
cluster
silver 1H IN A 208.80.154.136
diff --git a/templates/wmnet b/templates/wmnet
index 49cc970..6a5f329 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -4721,29 +4721,29 @@
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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2: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
+ 1H IN AAAA 2001:df2:e500:101:10:132:0:112
;
; SERVICES
--
To view, visit https://gerrit.wikimedia.org/r/389995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21ddb4a68cd5fe87c87d9790a1de725eb9d26ed3
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
