Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374545 )
Change subject: Add sandbox1-esams and ripe-atlas-esams
......................................................................
Add sandbox1-esams and ripe-atlas-esams
Change-Id: I09e1c82def7d0f4f04f08cfca07310452818e49f
---
M templates/174.198.91.in-addr.arpa
M templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/wikimedia.org
3 files changed, 25 insertions(+), 6 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/174.198.91.in-addr.arpa
b/templates/174.198.91.in-addr.arpa
index f7e7732..747e0be 100644
--- a/templates/174.198.91.in-addr.arpa
+++ b/templates/174.198.91.in-addr.arpa
@@ -13,9 +13,7 @@
1D IN NS ns1.wikimedia.org.
1D IN NS ns2.wikimedia.org.
-
-; Public services subnet 91.198.174.0/25 (91.198.174.0 - 91.198.174.127)
-
+; 91.198.174.0/25 public1-esams (91.198.174.0 - 91.198.174.127)
1 1H IN PTR vrrp-gw-100.esams.wikimedia.org.
2 1H IN PTR ae1-100.cr1-esams.wikimedia.org.
3 1H IN PTR ae1-100.cr2-esams.wikimedia.org.
@@ -33,7 +31,15 @@
121 1H IN PTR eeden.wikimedia.org.
122 1H IN PTR maerlant.wikimedia.org.
-; unused 91.198.174.128/26 (91.198.174.128 - 91.198.174.191)
+; 91.198.174.128/28 sandbox1-esams (91.198.174.128 - 91.198.174.143)
+129 1H IN PTR vrrp-gw-102.esams.wikimedia.org.
+130 1H IN PTR ae1-102.cr1-esams.wikimedia.org.
+131 1H IN PTR ae1-102.cr2-esams.wikimedia.org.
+132 1H IN PTR ripe-atlas-esams.wikimedia.org.
+
+; 91.198.174.144/28 (91.198.174.144 - 91.198.174.159)
+
+; 91.198.174.160/27 (91.198.174.160 - 91.198.174.191)
; 91.198.174.192/27 (192-223) LVS Service IPs
diff --git a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 0ef5700..9ca7b6f 100644
--- a/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/2.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -16,8 +16,9 @@
; esams 2620:0:862::/48
-; esams Public services subnet 2620:0:862:1::/64
+; esams public subnets (2620:0:862:0::/56)
+; public1-esams 2620:0:862:1::/64
$ORIGIN 1.0.0.0.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-100.esams.wikimedia.org.
@@ -33,8 +34,9 @@
1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-100.cr1-esams.wikimedia.org.
2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-100.cr2-esams.wikimedia.org.
-; private1-esams subnet 2620:0:862:102::/64
+; esams private subnets (2620:0:862:100::/56)
+; private1-esams subnet 2620:0:862:102::/64
$ORIGIN 2.0.1.0.{{ zonename }}.
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-103.esams.wikimedia.org.
@@ -102,6 +104,15 @@
d.0.0.0 1H IN PTR misc-web-lb.esams.wikimedia.org.
e.f.0.0 1H IN PTR dns-rec-lb.esams.wikimedia.org.
+; esams sandbox subnets (2620:0:862:200::/56)
+
+; sandbox1-esams (2620:0:862:201::/64)
+$ORIGIN 1.0.2.0.{{ zonename }}.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 1H IN PTR vrrp-gw-102.wikimedia.org.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-102.cr1-esams.wikimedia.org.
+2.0.0.0.0.0.0.0.0.0.0.0.0.0.e.f 1H IN PTR ae1-102.cr2-esams.wikimedia.org.
+2.3.1.0.4.7.1.0.8.9.1.0.1.9.0.0 1H IN PTR ripe-atlas-esams.wikimedia.org.
+
; unused (2620:0:862:fe00::/64)
$ORIGIN 0.0.e.f.{{ zonename }}.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 68d9506..9328c48 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -245,6 +245,8 @@
ripe-atlas-eqiad 1H IN AAAA 2620:0:861:202:208:80:155:69
ripe-atlas-codfw 1H IN A 208.80.152.244
ripe-atlas-codfw 1H IN AAAA 2620:0:860:201:208:80:152:244
+ripe-atlas-esams 1H IN A 91.198.174.132
+ripe-atlas-esams 1H IN AAAA 2620:0:862:201:91:198:174:132
ripe-atlas-ulsfo 1H IN A 198.35.26.244
ripe-atlas-ulsfo 1H IN AAAA 2620:0:863:201:198:35:26:244
seaborgium 1H IN A 208.80.154.79 ; VM on the ganeti01.svc.eqiad.wmnet
cluster
--
To view, visit https://gerrit.wikimedia.org/r/374545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09e1c82def7d0f4f04f08cfca07310452818e49f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
