BBlack has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367927 )

Change subject: recdns: do not use self in local resolv.conf
......................................................................

recdns: do not use self in local resolv.conf

Bug: T104442
Change-Id: I1d2483e21d9b89c4059056f03137be65270e0196
---
M manifests/site.pp
1 file changed, 23 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/367927/1

diff --git a/manifests/site.pp b/manifests/site.pp
index a6bb769..6c2ab9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,8 +12,20 @@
 
 # Node definitions (alphabetic order)
 
-node /^(acamar|achernar)\.wikimedia\.org$/ {
+node 'acamar.wikimedia.org' {
     role(dnsrecursor, ntp)
+
+    # use achernar (directly) + eqiad LVS (avoid self-dep)
+    $nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
+
+    interface::add_ip6_mapped { 'main': }
+}
+
+node 'achernar.wikimedia.org' {
+    role(dnsrecursor, ntp)
+
+    # use acamar (directly) + eqiad LVS (avoid self-dep)
+    $nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
 
     interface::add_ip6_mapped { 'main': }
 }
@@ -202,6 +214,9 @@
 # DNS recursor
 node 'chromium.wikimedia.org' {
     role(dnsrecursor, ntp)
+
+    # use hydrogen (directly) + codfw LVS (avoid self-dep)
+    $nameservers_override = [ '208.80.154.50', '208.80.153.254' ]
 
     interface::add_ip6_mapped { 'main': }
 }
@@ -767,6 +782,10 @@
 
 node 'eeden.wikimedia.org' {
     role(authdns::server)
+
+    # use eqiad LVS + codfw LVS (avoid self-dep)
+    $nameservers_override = [ '208.80.154.254', '208.80.153.254' ]
+
     interface::add_ip6_mapped { 'main': }
 }
 
@@ -956,6 +975,9 @@
 node 'hydrogen.wikimedia.org' {
     role(dnsrecursor, ntp)
 
+    # use chromium (directly) + codfw LVS (avoid self-dep)
+    $nameservers_override = [ '208.80.154.157', '208.80.153.254' ]
+
     interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d2483e21d9b89c4059056f03137be65270e0196
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

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

Reply via email to