BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/160851
Change subject: shift codfw LVS DNS over to private
......................................................................
shift codfw LVS DNS over to private
Change-Id: If34d573bfa81c788183fa2d09c2dfe6d0e4e64ab
---
M templates/10.in-addr.arpa
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
4 files changed, 98 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/51/160851/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 71ea620..c82c094 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2498,12 +2498,12 @@
22 1H IN PTR ms-be2004.codfw.wmnet.
$ORIGIN 1.192.{{ zonename }}.
-1 1H IN PTR vl2017-eth0.lvs2001.wikimedia.org.
-2 1H IN PTR vl2017-eth0.lvs2002.wikimedia.org.
-3 1H IN PTR vl2017-eth0.lvs2003.wikimedia.org.
-4 1H IN PTR vl2017-eth1.lvs2004.wikimedia.org.
-5 1H IN PTR vl2017-eth1.lvs2005.wikimedia.org.
-6 1H IN PTR vl2017-eth1.lvs2006.wikimedia.org.
+1 1H IN PTR lvs2001.codfw.wmnet.
+2 1H IN PTR lvs2002.codfw.wmnet.
+3 1H IN PTR lvs2003.codfw.wmnet.
+4 1H IN PTR vl2017-eth1.lvs2004.codfw.wmnet.
+5 1H IN PTR vl2017-eth1.lvs2005.codfw.wmnet.
+6 1H IN PTR vl2017-eth1.lvs2006.codfw.wmnet.
; 10.192.16.0/22 - private1-b-codfw
$ORIGIN 16.192.{{ zonename }}.
@@ -2534,12 +2534,12 @@
24 1H IN PTR ms-be2008.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
-1 1H IN PTR vl2018-eth1.lvs2001.wikimedia.org.
-2 1H IN PTR vl2018-eth1.lvs2002.wikimedia.org.
-3 1H IN PTR vl2018-eth1.lvs2003.wikimedia.org.
-4 1H IN PTR vl2018-eth0.lvs2004.wikimedia.org.
-5 1H IN PTR vl2018-eth0.lvs2005.wikimedia.org.
-6 1H IN PTR vl2018-eth0.lvs2006.wikimedia.org.
+1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
+2 1H IN PTR vl2018-eth1.lvs2002.codfw.wmnet.
+3 1H IN PTR vl2018-eth1.lvs2003.codfw.wmnet.
+4 1H IN PTR lvs2004.codfw.wmnet.
+5 1H IN PTR lvs2005.codfw.wmnet.
+6 1H IN PTR lvs2006.codfw.wmnet.
; 10.192.32.0/22 - private1-c-codfw
$ORIGIN 32.192.{{ zonename }}.
@@ -2563,12 +2563,12 @@
17 1H IN PTR ms-be2012.codfw.wmnet.
$ORIGIN 33.192.{{ zonename }}.
-1 1H IN PTR vl2019-eth2.lvs2001.wikimedia.org.
-2 1H IN PTR vl2019-eth2.lvs2002.wikimedia.org.
-3 1H IN PTR vl2019-eth2.lvs2003.wikimedia.org.
-4 1H IN PTR vl2019-eth2.lvs2004.wikimedia.org.
-5 1H IN PTR vl2019-eth2.lvs2005.wikimedia.org.
-6 1H IN PTR vl2019-eth2.lvs2006.wikimedia.org.
+1 1H IN PTR vl2019-eth2.lvs2001.codfw.wmnet.
+2 1H IN PTR vl2019-eth2.lvs2002.codfw.wmnet.
+3 1H IN PTR vl2019-eth2.lvs2003.codfw.wmnet.
+4 1H IN PTR vl2019-eth2.lvs2004.codfw.wmnet.
+5 1H IN PTR vl2019-eth2.lvs2005.codfw.wmnet.
+6 1H IN PTR vl2019-eth2.lvs2006.codfw.wmnet.
; 10.192.48.0/22 - private1-d-codfw
$ORIGIN 48.192.{{ zonename }}.
@@ -2578,12 +2578,12 @@
3 1H IN PTR ae4-2020.cr2-codfw.wikimedia.org.
$ORIGIN 49.192.{{ zonename }}.
-1 1H IN PTR vl2020-eth3.lvs2001.wikimedia.org.
-2 1H IN PTR vl2020-eth3.lvs2002.wikimedia.org.
-3 1H IN PTR vl2020-eth3.lvs2003.wikimedia.org.
-4 1H IN PTR vl2020-eth3.lvs2004.wikimedia.org.
-5 1H IN PTR vl2020-eth3.lvs2005.wikimedia.org.
-6 1H IN PTR vl2020-eth3.lvs2006.wikimedia.org.
+1 1H IN PTR vl2020-eth3.lvs2001.codfw.wmnet.
+2 1H IN PTR vl2020-eth3.lvs2002.codfw.wmnet.
+3 1H IN PTR vl2020-eth3.lvs2003.codfw.wmnet.
+4 1H IN PTR vl2020-eth3.lvs2004.codfw.wmnet.
+5 1H IN PTR vl2020-eth3.lvs2005.codfw.wmnet.
+6 1H IN PTR vl2020-eth3.lvs2006.codfw.wmnet.
$ORIGIN 0.193.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa
b/templates/153.80.208.in-addr.arpa
index 124b3d6..88013d4 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -20,12 +20,12 @@
3 1H IN PTR ae1-2001.cr2-codfw.wikimedia.org.
4 1H IN PTR install2001.wikimedia.org.
5 1H IN PTR bast2001.wikimedia.org.
-6 1H IN PTR lvs2001.wikimedia.org.
-7 1H IN PTR lvs2002.wikimedia.org.
-8 1H IN PTR lvs2003.wikimedia.org.
-9 1H IN PTR vl2001-eth1.lvs2004.wikimedia.org.
-10 1H IN PTR vl2001-eth1.lvs2005.wikimedia.org.
-11 1H IN PTR vl2001-eth1.lvs2006.wikimedia.org.
+6 1H IN PTR vl2001-eth0.lvs2001.codfw.wmnet.
+7 1H IN PTR vl2001-eth0.lvs2002.codfw.wmnet.
+8 1H IN PTR vl2001-eth0.lvs2003.codfw.wmnet.
+9 1H IN PTR vl2001-eth1.lvs2004.codfw.wmnet.
+10 1H IN PTR vl2001-eth1.lvs2005.codfw.wmnet.
+11 1H IN PTR vl2001-eth1.lvs2006.codfw.wmnet.
12 1H IN PTR acamar.wikimedia.org.
13 1H IN PTR baham.wikimedia.org.
14 1H IN PTR labcontrol2001.wikimedia.org.
@@ -34,35 +34,35 @@
33 1H IN PTR vrrp-gw-2002.wikimedia.org.
34 1H IN PTR ae2-2002.cr1-codfw.wikimedia.org.
35 1H IN PTR ae2-2002.cr2-codfw.wikimedia.org.
-36 1H IN PTR lvs2004.wikimedia.org.
-37 1H IN PTR lvs2005.wikimedia.org.
-38 1H IN PTR lvs2006.wikimedia.org.
-39 1H IN PTR vl2002-eth1.lvs2001.wikimedia.org.
-40 1H IN PTR vl2002-eth1.lvs2002.wikimedia.org.
-41 1H IN PTR vl2002-eth1.lvs2003.wikimedia.org.
+36 1H IN PTR vl2002-eth0.lvs2004.codfw.wmnet.
+37 1H IN PTR vl2002-eth0.lvs2005.codfw.wmnet.
+38 1H IN PTR vl2002-eth0.lvs2006.codfw.wmnet.
+39 1H IN PTR vl2002-eth1.lvs2001.codfw.wmnet.
+40 1H IN PTR vl2002-eth1.lvs2002.codfw.wmnet.
+41 1H IN PTR vl2002-eth1.lvs2003.codfw.wmnet.
42 1H IN PTR achernar.wikimedia.org.
; 208.80.153.64/27 (public1-c-codfw)
65 1H IN PTR vrrp-gw-2003.wikimedia.org.
66 1H IN PTR ae3-2003.cr1-codfw.wikimedia.org.
67 1H IN PTR ae3-2003.cr2-codfw.wikimedia.org.
-68 1H IN PTR vl2003-eth2.lvs2001.wikimedia.org.
-69 1H IN PTR vl2003-eth2.lvs2002.wikimedia.org.
-70 1H IN PTR vl2003-eth2.lvs2003.wikimedia.org.
-71 1H IN PTR vl2003-eth2.lvs2004.wikimedia.org.
-72 1H IN PTR vl2003-eth2.lvs2005.wikimedia.org.
-73 1H IN PTR vl2003-eth2.lvs2006.wikimedia.org.
+68 1H IN PTR vl2003-eth2.lvs2001.codfw.wmnet.
+69 1H IN PTR vl2003-eth2.lvs2002.codfw.wmnet.
+70 1H IN PTR vl2003-eth2.lvs2003.codfw.wmnet.
+71 1H IN PTR vl2003-eth2.lvs2004.codfw.wmnet.
+72 1H IN PTR vl2003-eth2.lvs2005.codfw.wmnet.
+73 1H IN PTR vl2003-eth2.lvs2006.codfw.wmnet.
; 208.80.153.96/27 (public1-d-codfw)
97 1H IN PTR vrrp-gw-2004.wikimedia.org.
98 1H IN PTR ae4-2004.cr1-codfw.wikimedia.org.
99 1H IN PTR ae4-2004.cr2-codfw.wikimedia.org.
-100 1H IN PTR vl2004-eth3.lvs2001.wikimedia.org.
-101 1H IN PTR vl2004-eth3.lvs2002.wikimedia.org.
-102 1H IN PTR vl2004-eth3.lvs2003.wikimedia.org.
-103 1H IN PTR vl2004-eth3.lvs2004.wikimedia.org.
-104 1H IN PTR vl2004-eth3.lvs2005.wikimedia.org.
-105 1H IN PTR vl2004-eth3.lvs2006.wikimedia.org.
+100 1H IN PTR vl2004-eth3.lvs2001.codfw.wmnet.
+101 1H IN PTR vl2004-eth3.lvs2002.codfw.wmnet.
+102 1H IN PTR vl2004-eth3.lvs2003.codfw.wmnet.
+103 1H IN PTR vl2004-eth3.lvs2004.codfw.wmnet.
+104 1H IN PTR vl2004-eth3.lvs2005.codfw.wmnet.
+105 1H IN PTR vl2004-eth3.lvs2006.codfw.wmnet.
; Neighbor blocks & loopbacks (208.80.153.192/27)
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 424fc7d..4ddec90 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -163,12 +163,6 @@
lvs1004 1H IN A 208.80.154.137
lvs1005 1H IN A 208.80.154.138
lvs1006 1H IN A 208.80.154.139
-lvs2001 1H IN A 208.80.153.6
-lvs2002 1H IN A 208.80.153.7
-lvs2003 1H IN A 208.80.153.8
-lvs2004 1H IN A 208.80.153.36
-lvs2005 1H IN A 208.80.153.37
-lvs2006 1H IN A 208.80.153.38
magnesium 1H IN A 208.80.154.5
mchenry 1H IN A 208.80.152.186
mercury 1H IN A 208.80.154.86
@@ -380,50 +374,6 @@
vl1020-eth3.lvs1004 1H IN A 10.64.49.4
vl1020-eth3.lvs1005 1H IN A 10.64.49.5
vl1020-eth3.lvs1006 1H IN A 10.64.49.6
-
-vl2001-eth1.lvs2004 1H IN A 208.80.153.9
-vl2001-eth1.lvs2005 1H IN A 208.80.153.10
-vl2001-eth1.lvs2006 1H IN A 208.80.153.11
-vl2002-eth1.lvs2001 1H IN A 208.80.153.39
-vl2002-eth1.lvs2002 1H IN A 208.80.153.40
-vl2002-eth1.lvs2003 1H IN A 208.80.153.41
-vl2003-eth2.lvs2001 1H IN A 208.80.153.68
-vl2003-eth2.lvs2002 1H IN A 208.80.153.69
-vl2003-eth2.lvs2003 1H IN A 208.80.153.70
-vl2003-eth2.lvs2004 1H IN A 208.80.153.71
-vl2003-eth2.lvs2005 1H IN A 208.80.153.72
-vl2003-eth2.lvs2006 1H IN A 208.80.153.73
-vl2004-eth3.lvs2001 1H IN A 208.80.153.100
-vl2004-eth3.lvs2002 1H IN A 208.80.153.101
-vl2004-eth3.lvs2003 1H IN A 208.80.153.102
-vl2004-eth3.lvs2004 1H IN A 208.80.153.103
-vl2004-eth3.lvs2005 1H IN A 208.80.153.104
-vl2004-eth3.lvs2006 1H IN A 208.80.153.105
-
-vl2017-eth0.lvs2001 1H IN A 10.192.1.1
-vl2017-eth0.lvs2002 1H IN A 10.192.1.2
-vl2017-eth0.lvs2003 1H IN A 10.192.1.3
-vl2017-eth1.lvs2004 1H IN A 10.192.1.4
-vl2017-eth1.lvs2005 1H IN A 10.192.1.5
-vl2017-eth1.lvs2006 1H IN A 10.192.1.6
-vl2018-eth1.lvs2001 1H IN A 10.192.17.1
-vl2018-eth1.lvs2002 1H IN A 10.192.17.2
-vl2018-eth1.lvs2003 1H IN A 10.192.17.3
-vl2018-eth0.lvs2004 1H IN A 10.192.17.4
-vl2018-eth0.lvs2005 1H IN A 10.192.17.5
-vl2018-eth0.lvs2006 1H IN A 10.192.17.6
-vl2019-eth2.lvs2001 1H IN A 10.192.33.1
-vl2019-eth2.lvs2002 1H IN A 10.192.33.2
-vl2019-eth2.lvs2003 1H IN A 10.192.33.3
-vl2019-eth2.lvs2004 1H IN A 10.192.33.4
-vl2019-eth2.lvs2005 1H IN A 10.192.33.5
-vl2019-eth2.lvs2006 1H IN A 10.192.33.6
-vl2020-eth3.lvs2001 1H IN A 10.192.49.1
-vl2020-eth3.lvs2002 1H IN A 10.192.49.2
-vl2020-eth3.lvs2003 1H IN A 10.192.49.3
-vl2020-eth3.lvs2004 1H IN A 10.192.49.4
-vl2020-eth3.lvs2005 1H IN A 10.192.49.5
-vl2020-eth3.lvs2006 1H IN A 10.192.49.6
csw1-knams 1H IN CNAME csw1-esams
diff --git a/templates/wmnet b/templates/wmnet
index bf63727..1a2499e 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2076,6 +2076,12 @@
db2040 1H IN A 10.192.32.11
db2041 1H IN A 10.192.32.12
db2042 1H IN A 10.192.32.13
+lvs2001 1H IN A 10.192.1.1
+lvs2002 1H IN A 10.192.1.2
+lvs2003 1H IN A 10.192.1.3
+lvs2004 1H IN A 10.192.17.4
+lvs2005 1H IN A 10.192.17.5
+lvs2006 1H IN A 10.192.17.6
ms-be2001 1H IN A 10.192.0.19
ms-be2002 1H IN A 10.192.0.20
ms-be2003 1H IN A 10.192.0.21
@@ -2089,6 +2095,50 @@
ms-be2011 1H IN A 10.192.32.16
ms-be2012 1H IN A 10.192.32.17
+; codfw LVS cross-vlan addresses
+vl2001-eth0.lvs2001 1H IN A 208.80.153.6
+vl2001-eth0.lvs2002 1H IN A 208.80.153.7
+vl2001-eth0.lvs2003 1H IN A 208.80.153.8
+vl2001-eth1.lvs2004 1H IN A 208.80.153.9
+vl2001-eth1.lvs2005 1H IN A 208.80.153.10
+vl2001-eth1.lvs2006 1H IN A 208.80.153.11
+vl2002-eth1.lvs2001 1H IN A 208.80.153.39
+vl2002-eth1.lvs2002 1H IN A 208.80.153.40
+vl2002-eth1.lvs2003 1H IN A 208.80.153.41
+vl2002-eth0.lvs2004 1H IN A 208.80.153.36
+vl2002-eth0.lvs2005 1H IN A 208.80.153.37
+vl2002-eth0.lvs2006 1H IN A 208.80.153.38
+vl2003-eth2.lvs2001 1H IN A 208.80.153.68
+vl2003-eth2.lvs2002 1H IN A 208.80.153.69
+vl2003-eth2.lvs2003 1H IN A 208.80.153.70
+vl2003-eth2.lvs2004 1H IN A 208.80.153.71
+vl2003-eth2.lvs2005 1H IN A 208.80.153.72
+vl2003-eth2.lvs2006 1H IN A 208.80.153.73
+vl2004-eth3.lvs2001 1H IN A 208.80.153.100
+vl2004-eth3.lvs2002 1H IN A 208.80.153.101
+vl2004-eth3.lvs2003 1H IN A 208.80.153.102
+vl2004-eth3.lvs2004 1H IN A 208.80.153.103
+vl2004-eth3.lvs2005 1H IN A 208.80.153.104
+vl2004-eth3.lvs2006 1H IN A 208.80.153.105
+vl2017-eth1.lvs2004 1H IN A 10.192.1.4
+vl2017-eth1.lvs2005 1H IN A 10.192.1.5
+vl2017-eth1.lvs2006 1H IN A 10.192.1.6
+vl2018-eth1.lvs2001 1H IN A 10.192.17.1
+vl2018-eth1.lvs2002 1H IN A 10.192.17.2
+vl2018-eth1.lvs2003 1H IN A 10.192.17.3
+vl2019-eth2.lvs2001 1H IN A 10.192.33.1
+vl2019-eth2.lvs2002 1H IN A 10.192.33.2
+vl2019-eth2.lvs2003 1H IN A 10.192.33.3
+vl2019-eth2.lvs2004 1H IN A 10.192.33.4
+vl2019-eth2.lvs2005 1H IN A 10.192.33.5
+vl2019-eth2.lvs2006 1H IN A 10.192.33.6
+vl2020-eth3.lvs2001 1H IN A 10.192.49.1
+vl2020-eth3.lvs2002 1H IN A 10.192.49.2
+vl2020-eth3.lvs2003 1H IN A 10.192.49.3
+vl2020-eth3.lvs2004 1H IN A 10.192.49.4
+vl2020-eth3.lvs2005 1H IN A 10.192.49.5
+vl2020-eth3.lvs2006 1H IN A 10.192.49.6
+
; CODFW management
--
To view, visit https://gerrit.wikimedia.org/r/160851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If34d573bfa81c788183fa2d09c2dfe6d0e4e64ab
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
