Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Add SRV records for puppet (all pointing to
palladium.eqiad.wmnet)
......................................................................
Add SRV records for puppet (all pointing to palladium.eqiad.wmnet)
Please note this will work only once we've set up palladium to use the
proper SSL and the clients to use the srv record instead than the
"puppet" name.
Bug: T143869
Change-Id: I1105e25c5868e75a41f9f55f2fefc5c4dd8daf80
---
M templates/wikimedia.org
M templates/wmnet
2 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index e277c40..8798e84 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -729,6 +729,10 @@
pinkunicorn 600 A 208.80.154.42
600 AAAA 2620:0:861:1:208:80:154:42
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+
; Misc
; Google apps
diff --git a/templates/wmnet b/templates/wmnet
index 449c423..3fbc70f 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -80,6 +80,9 @@
_etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet.
_etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet.
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
; Cameras
cam1-a-eqiad 1H IN A 10.64.0.27
@@ -2337,6 +2340,10 @@
_etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet.
_etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet.
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+
; hack to make ocg work when switching over to codfw - these are the eqiad
servers
ocg1001 1H IN A 10.64.32.151
ocg1002 1H IN A 10.64.48.42
@@ -4058,6 +4065,10 @@
_etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet.
_etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet.
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+
; temporary RR until we get new LVS up
ms-fe 600 IN A 10.20.0.15
ms-fe 600 IN A 10.20.0.16
@@ -4247,6 +4258,10 @@
_etcd._tcp 5M IN SRV 0 1 2379 conf1002.eqiad.wmnet.
_etcd._tcp 5M IN SRV 0 1 2379 conf1003.eqiad.wmnet.
+; puppet records
+_x-puppet-ca._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+_x-puppet._tcp 5M IN SRV 0 1 8140 palladium.eqiad.wmnet.
+
; EQIAD SERVICES
$ORIGIN svc.eqiad.wmnet.
--
To view, visit https://gerrit.wikimedia.org/r/306642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1105e25c5868e75a41f9f55f2fefc5c4dd8daf80
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
