BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270285
Change subject: move most of esams to standard layout
......................................................................
move most of esams to standard layout
functional no-op, but moves various esams.wikimedia.org hostnames
out of its ORIGIN block and up to where the other DCs define such
things, and moves non-subdomain esams servers up to the main
alphabetical list.
Change-Id: I0bbdfbb8cf6f3b0ba31490c68169a755dd655d3b
---
M templates/wikimedia.org
1 file changed, 27 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/85/270285/1
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 56647ee..5242b97 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -119,6 +119,8 @@
1H IN AAAA 2620:0:861:1:208:80:154:11
dickson 1H IN A 208.80.155.68
1H IN AAAA 2620:0:861:202:208:80:155:68
+eeden 1H IN A 91.198.174.121
+ 1H IN AAAA 2620:0:862:1:91:198:174:121
einsteinium 1H IN A 208.80.155.119
fermium 1H IN A 208.80.154.74 ; VM on the ganeti01.svc.eqiad.wmnet
cluster
1H IN AAAA 2620:0:861:3:208:80:154:74
@@ -148,13 +150,19 @@
lvs1004 1H IN A 208.80.154.137
lvs1005 1H IN A 208.80.154.138
lvs1006 1H IN A 208.80.154.139
+maerlant 1H IN A 91.198.174.122
+ 1H IN AAAA 2620:0:862:1:91:198:174:122
magnesium 1H IN A 208.80.154.5
ms1001 1H IN A 208.80.154.16
1H IN AAAA 2620:0:861:1:208:80:154:16
+multatuli 1H IN A 91.198.174.114
+ 1H IN AAAA 2620:0:862:1:91:198:174:114
mx1001 1H IN A 208.80.154.76 ; VM on the ganeti01.svc.eqiad.wmnet
cluster
1H IN AAAA 2620:0:861:3:208:80:154:76
mx2001 1H IN A 208.80.153.45 ; VM on the ganeti01.svc.codfw.wmnet
cluster
1H IN AAAA 2620:0:860:2:208:80:153:45
+nescio 1H IN A 91.198.174.106
+ 1H IN AAAA 2620:0:862:1:91:198:174:106
neon 1H IN A 208.80.154.14
1H IN AAAA 2620:0:861:1:208:80:154:14
netmon1001 1H IN A 208.80.154.159
@@ -199,6 +207,9 @@
;;; codfw
ntp.codfw 1H IN CNAME acamar
+
+;;; esams
+ntp.esams 1H IN CNAME maerlant
; Round Robin LVS Service records
@@ -263,6 +274,21 @@
misc-web-lb.codfw 600 IN DYNA geoip!misc-addrs/codfw
donate-lb.codfw 600 IN DYNA geoip!text-addrs/codfw
geoiplookup-lb.codfw 600 IN DYNA geoip!geoiplookup-addrs/codfw
+
+;;; esams
+text-lb.esams 600 IN DYNA geoip!text-addrs/esams
+upload-lb.esams 600 IN DYNA geoip!upload-addrs/esams
+mobile-lb.esams 600 IN DYNA geoip!mobile-addrs/esams
+; XXX temporary, should be DYNA geoip!maps-addrs/esams
+maps-lb.esams 1H IN A 91.198.174.209
+ 1H IN AAAA 2620:0:862:ed1a::2:d
+misc-web-lb.esams 600 IN DYNA geoip!misc-addrs/esams
+geoiplookup-lb.esams 600 IN DYNA geoip!geoiplookup-addrs/esams
+donate-lb.esams 600 IN DYNA geoip!text-addrs/esams
+ 1H IN MX 10 mx1001.wikimedia.org.
+ 1H IN MX 50 mx2001.wikimedia.org.
+dns-rec-lb.esams 1H IN A 91.198.174.216
+ 1H IN AAAA 2620:0:862:ed1a::3:fe
; Mobile
@@ -745,28 +771,13 @@
ns2 1H IN A 198.73.209.16
; esams cluster
-
-$ORIGIN {{ zonename }}.
-
-; Servers
-
-eeden 1H IN A 91.198.174.121
- 1H IN AAAA 2620:0:862:1:91:198:174:121
-maerlant 1H IN A 91.198.174.122
- 1H IN AAAA 2620:0:862:1:91:198:174:122
-multatuli 1H IN A 91.198.174.114
- 1H IN AAAA 2620:0:862:1:91:198:174:114
-nescio 1H IN A 91.198.174.106
- 1H IN AAAA 2620:0:862:1:91:198:174:106
-
$ORIGIN esams.{{ zonename }}.
; Service aliases
-
+; FIXME: all 3 of these are suspect, we don't do these per-subdomain
elsewhere..
puppet 1H IN CNAME palladium.eqiad.wmnet.
recursor0 1H IN A 91.198.174.216 ; esams LVS (dns-rec-lb)
recursor1 1H IN A 208.80.154.239 ; eqiad LVS (dns-rec-lb)
-ntp 1H IN CNAME maerlant.wikimedia.org.
; Servers
; FIXME: these stay under .esams.wikimedia.org until they get reprovisioned
@@ -776,20 +787,4 @@
1H IN AAAA 2620:0:862:1:91:198:174:113
; Management
-
scs-oe11-esams 1H IN A 10.21.0.102
-
-; Round robin record
-text-lb 600 IN DYNA geoip!text-addrs/esams
-upload-lb 600 IN DYNA geoip!upload-addrs/esams
-mobile-lb 600 IN DYNA geoip!mobile-addrs/esams
-; XXX temporary, should be DYNA geoip!maps-addrs/esams
-maps-lb 1H IN A 91.198.174.209
- 1H IN AAAA 2620:0:862:ed1a::2:d
-misc-web-lb 600 IN DYNA geoip!misc-addrs/esams
-geoiplookup-lb 600 IN DYNA geoip!geoiplookup-addrs/esams
-donate-lb 600 IN DYNA geoip!text-addrs/esams
- 1H IN MX 10 mx1001.wikimedia.org.
- 1H IN MX 50 mx2001.wikimedia.org.
-dns-rec-lb 1H IN A 91.198.174.216
- 1H IN AAAA 2620:0:862:ed1a::3:fe
--
To view, visit https://gerrit.wikimedia.org/r/270285
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bbdfbb8cf6f3b0ba31490c68169a755dd655d3b
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
