Lcarr has submitted this change and it was merged.
Change subject: IPv6 blocks for ulsfo interconnects and loopbacks
......................................................................
IPv6 blocks for ulsfo interconnects and loopbacks
Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
---
M templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
2 files changed, 26 insertions(+), 4 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 2c9fd92..d0b36d0 100644
--- a/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/3.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -13,7 +13,8 @@
1D IN NS ns0.wikimedia.org.
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-; Loopback IPs
+
+; Infrastructure IPs
; cr1-ulsfo <--> cr2-ulsfo (2620:0:863:fe00::/64)
@@ -28,10 +29,25 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-5-2-2.cr2-eqiad.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR
xe-0-0-3-538.cr1-ulsfo.wikimedia.org.
+; cr1-ulsfo <--> br1-ulsfo (2620:0:863:fe02::/64)
+
+$ORIGIN 2.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr1-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br1-ulsfo.wikimedia.org.
+
+; cr2-ulsfo <--> br2-ulsfo (2620:0:863:fe03::/64)
+
+$ORIGIN 3.0.e.f.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-0.cr2-ulsfo.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR lt0-1.br2-ulsfo.wikimedia.org.
+
+; Loopback IPs
$ORIGIN f.f.f.f.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr1-ulsfo.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR cr2-ulsfo.wikimedia.org.
+3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br1-ulsfo.wikimedia.org.
+4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR br2-ulsfo.wikimedia.org.
; LVS Service IPs
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 1d4a879..22dedf9 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -471,6 +471,12 @@
; Networking
+br1-ulsfo 1H IN A 198.35.26.194
+ AAAA 2620:0:863:ffff::3
+
+br2-ulsfo 1H IN A 198.35.26.195
+ AAAA 2620:0:863:ffff::4
+
cr1-eqiad 1H IN A 208.80.154.196
IN AAAA 2620:0:861:ffff::1
@@ -483,9 +489,6 @@
cr1-ulsfo 1H IN A 198.35.26.192
IN AAAA 2620:0:863:ffff::1
-cr2-ulsfo 1H IN A 198.35.26.193
- IN AAAA 2620:0:863:ffff::2
-
cr2-eqiad 1H IN A 208.80.154.197
IN AAAA 2620:0:861:ffff::2
@@ -495,6 +498,9 @@
cr2-pmtpa 1H IN A 208.80.152.197
IN AAAA 2620:0:860:ffff::5
+cr2-ulsfo 1H IN A 198.35.26.193
+ IN AAAA 2620:0:863:ffff::2
+
csw1-esams 1H IN A 91.198.174.247
1H IN AAAA 2620:0:862:ffff::1
--
To view, visit https://gerrit.wikimedia.org/r/89822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I583a72f948d1aa50e61142b39684219023b7510b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Lcarr <lc...@wikimedia.org>
Gerrit-Reviewer: Lcarr <lc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
