John F. Lewis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/203544

Change subject: codfw: add datacenter to dns config
......................................................................

codfw: add datacenter to dns config

Adds a codfw datacenter to the geo config and adds relevant PTR
records and service records into the relevant files.

The IPs copy how eqiad have them laid out as it seems both datacenters
will aspire to host the same services so keeping the same IP endings
may be suitable. Also based on existing comments about range allocation.

This is just a basic addition which adds everything necessary to
allow codfw into the dns scheme and can be modified to suit any needs
now (or later).

Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
---
M templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
M templates/153.80.208.in-addr.arpa
M templates/wikimedia.org
3 files changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/44/203544/1

diff --git a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa 
b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
index 7fd41e6..ab6f314 100644
--- a/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
+++ b/templates/0.6.8.0.0.0.0.0.0.2.6.2.ip6.arpa
@@ -139,16 +139,23 @@
 
 $ORIGIN 0.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+1.0.0.0 1H IN PTR   text-lb.eqiad.wikimedia.org.
 e.0.0.0 1H IN PTR   ns1.wikimedia.org.
 
 ; LVS Mobile Zero & general support, 2620:0:860:ed1a::1:0/112
 
 $ORIGIN 1.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+9.0.0.0                         1H IN PTR   login-lb.eqiad.wikimedia.org.
+a.0.0.0                         1H IN PTR   bits-lb.eqiad.wikimedia.org.
+c.0.0.0                         1H IN PTR   mobile-lb.eqiad.wikimedia.org.
+
 ; LVS Multimedia, 2620:0:860:ed1a::2:0/112
 
 $ORIGIN 2.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
 
+b.0.0.0                         1H IN PTR   upload-lb.eqiad.wikimedia.org.
+
 ; LVS Misc, 2620:0:860:ed1a::3:0/112
 
 $ORIGIN 3.0.0.0.0.0.0.0.0.0.0.0.a.1.d.e.{{ zonename }}.
diff --git a/templates/153.80.208.in-addr.arpa 
b/templates/153.80.208.in-addr.arpa
index 73685c0..84bc704 100644
--- a/templates/153.80.208.in-addr.arpa
+++ b/templates/153.80.208.in-addr.arpa
@@ -104,11 +104,16 @@
 ; LVS out-of-subnet service IPs (208.80.153.224/27)
 
 ; Desktop Text & Assets  208.80.153.224 - .231 (208.80.153.224/29)
+224 1H  IN PTR  text-lb.codfw.wikimedia.org.
 231 1H  IN PTR  ns1.wikimedia.org.
 
 ; Mobile Zero & general Support 208.80.153.232 - .239 (208.80.153.232/29)
+233 1H  IN PTR  login-lb.codfw.wikimedia.org.
+234 1H  IN PTR  bits-lb.codfw.wikimedia.org.
+236 1H  IN PTR  mobile-lb.codfw.wikimedia.org.
 
 ; Multimedia 208.80.153.240 - .247 (208.80.153.240/29)
+240 1H  IN PTR  upload-lb.codfw.wikimedia.org.
 
 ; Misc 208.80.153.248 - .255 (208.80.153.248/29)
 254  1H  IN PTR dns-rec-lb.codfw.wikimedia.org.
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 3c4a15a..7dc9e46 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -261,6 +261,12 @@
 ;;; codfw
 dns-rec-lb.codfw    1H  IN A    208.80.153.254
                     1H  IN AAAA 2620:0:860:ed1a::3:fe
+text-lb.codfw       600 IN DYNA geoip!text-addrs/codfw
+login-lb.codfw      600 IN DYNA geoip!login-addrs/codfw
+bits-lb.codfw       600 IN DYNA geoip!bits-addrs/codfw
+upload-lb.codfw     600 IN DYNA geoip!upload-addrs/codfw
+mobile-lb.codfw     600 IN DYNA geoip!mobile-addrs/codfw
+donate-lb.codfw     600 IN DYNA geoip!text-addrs-v4/codfw
 
 ; Mobile
 

-- 
To view, visit https://gerrit.wikimedia.org/r/203544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e2b4c740c7eeaee57450df3b5326ce88c95b700
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: John F. Lewis <johnflewi...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to