Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/255393
Change subject: Labs instances: Exchange the order of the primary/secondary dns
recursors.
......................................................................
Labs instances: Exchange the order of the primary/secondary dns recursors.
labs-recursor1 is assigned to labservices1001 which for the time being will
be the primary designate/dns box.
Also, change the timeout from 5 seconds to 2 seconds, because 5
was long enough to cause an alert storm when the primary went down.
Bug: T106303
Change-Id: I46ac38c344b53e772c3acf02d792a810fb6302f1
---
M hieradata/labs.yaml
M modules/base/templates/resolv.conf.labs.erb
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/255393/1
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index b3135ad..3232470 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -49,8 +49,8 @@
"${::fqdn}": 1
nrpe::allowed_hosts: '10.68.16.195'
-labs_recursor: "labs-recursor0.wikimedia.org"
-labs_recursor_secondary: "labs-recursor1.wikimedia.org"
+labs_recursor: "labs-recursor1.wikimedia.org"
+labs_recursor_secondary: "labs-recursor0.wikimedia.org"
nfs_mounts:
project: true
home: true
diff --git a/modules/base/templates/resolv.conf.labs.erb
b/modules/base/templates/resolv.conf.labs.erb
index 7495e29..12dd76f 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -8,4 +8,4 @@
<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
nameserver <%= nsip %>
<% end -%>
-options timeout:5 ndots:2
+options timeout:2 ndots:2
--
To view, visit https://gerrit.wikimedia.org/r/255393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46ac38c344b53e772c3acf02d792a810fb6302f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
