Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/382027 )
Change subject: labweb: move to internal VLAN
......................................................................
labweb: move to internal VLAN
With the intention of folding these services
behind varnish
Bug: T167820
Change-Id: Ib4ff1ee9938aa187861a102139fbfca5513a45db
---
M templates/10.in-addr.arpa
M templates/154.80.208.in-addr.arpa
M templates/155.80.208.in-addr.arpa
M templates/wikimedia.org
M templates/wmnet
5 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 1a51b3f..0416669 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -642,6 +642,7 @@
197 1H IN PTR mw1316.eqiad.wmnet.
198 1H IN PTR mw1317.eqiad.wmnet.
199 1H IN PTR mw1318.eqiad.wmnet.
+200 1H IN PTR labweb1001.eqiad.wmnet.
$ORIGIN 17.64.{{ zonename }}.
@@ -1223,7 +1224,7 @@
167 1H IN PTR conf1006.eqiad.wmnet.
168 1H IN PTR restbase-dev1006-a.eqiad.wmnet. ; cassandra instance
169 1H IN PTR restbase-dev1006-b.eqiad.wmnet. ; cassandra instance
-
+170 1H IN PTR labweb1002.eqiad.wmnet.
$ORIGIN 49.64.{{ zonename }}.
1 1H IN PTR vl1020-eth3.lvs1001.wikimedia.org.
diff --git a/templates/154.80.208.in-addr.arpa
b/templates/154.80.208.in-addr.arpa
index fa14521..9bef1b9 100644
--- a/templates/154.80.208.in-addr.arpa
+++ b/templates/154.80.208.in-addr.arpa
@@ -110,7 +110,6 @@
157 1H IN PTR chromium.wikimedia.org.
158 1H IN PTR labpuppetmaster1001.wikimedia.org.
-160 1H IN PTR labweb1001.wikimedia.org.
161 1H IN PTR vl1002-eth2.lvs1007.eqiad.wmnet.
162 1H IN PTR vl1002-eth2.lvs1008.eqiad.wmnet.
163 1H IN PTR vl1002-eth2.lvs1009.eqiad.wmnet.
diff --git a/templates/155.80.208.in-addr.arpa
b/templates/155.80.208.in-addr.arpa
index 71e79e5..39917f7 100644
--- a/templates/155.80.208.in-addr.arpa
+++ b/templates/155.80.208.in-addr.arpa
@@ -48,7 +48,6 @@
105 1H IN PTR vl1004-eth3.lvs1006.wikimedia.org.
106 1H IN PTR labstore1007.wikimedia.org.
-109 1H IN PTR labweb1002.wikimedia.org.
110 1H IN PTR astatine.wikimedia.org.
111 1H IN PTR vl1004-eth3.lvs1007.eqiad.wmnet.
112 1H IN PTR vl1004-eth3.lvs1008.eqiad.wmnet.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index dc26e28..10fc75e 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -202,8 +202,6 @@
labtestservices2003 1H IN A 208.80.153.109
labtestweb2001 1H IN A 208.80.153.14
labtestweb2001 1H IN AAAA 2620:0:860:1:208:80:153:14
-labweb1001 1H IN A 208.80.154.160
-labweb1002 1H IN A 208.80.155.109
lvs1001 1H IN A 208.80.154.55
lvs1002 1H IN A 208.80.154.56
lvs1003 1H IN A 208.80.154.57
diff --git a/templates/wmnet b/templates/wmnet
index 2a78b25..5e7c782 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -1182,9 +1182,9 @@
wmf7132 1H IN A 10.65.5.76
labvirt1020 1H IN A 10.65.5.77
wmf7133 1H IN A 10.65.5.77
-labweb1001 1H IN A 10.65.4.121
+labweb1001 1H IN A 10.64.16.200
wmf7096 1H IN A 10.65.4.121
-labweb1002 1H IN A 10.65.4.122
+labweb1002 1H IN A 10.64.48.170
wmf7097 1H IN A 10.65.4.122
restbase-dev1001 1H IN A 10.65.3.94
WMF4086 1H IN A 10.65.3.94
--
To view, visit https://gerrit.wikimedia.org/r/382027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4ff1ee9938aa187861a102139fbfca5513a45db
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
