[MediaWiki-commits] [Gerrit] Labs resolv.conf: don't sort the array of resolvers. - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review) 
Andrew Bogott has submitted this change and it was merged.

Change subject: Labs resolv.conf:  don't sort the array of resolvers.
..


Labs resolv.conf:  don't sort the array of resolvers.

Sorting meant that we had no control over which was primary and which
was secondary.

Bug: T106303
Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
---
M modules/base/templates/resolv.conf.labs.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  coren: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 12dd76f..973fe43 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -5,7 +5,7 @@
 
 domain <%= @labsproject %>.<%= @site %>.wmflabs
 search <%= @labsproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
-<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
+<% scope.lookupvar('::nameservers').each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
 options timeout:2 ndots:2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Labs resolv.conf: don't sort the array of resolvers. - change (operations/puppet)

2015-11-25 Thread Andrew Bogott (Code Review) 
Andrew Bogott has uploaded a new change for review.

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

Change subject: Labs resolv.conf:  don't sort the array of resolvers.
..

Labs resolv.conf:  don't sort the array of resolvers.

Sorting meant that we had no control over which was primary and which
was secondary.

Bug: T106303
Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
---
M modules/base/templates/resolv.conf.labs.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/255411/1

diff --git a/modules/base/templates/resolv.conf.labs.erb 
b/modules/base/templates/resolv.conf.labs.erb
index 12dd76f..973fe43 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -5,7 +5,7 @@
 
 domain <%= @labsproject %>.<%= @site %>.wmflabs
 search <%= @labsproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
-<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
+<% scope.lookupvar('::nameservers').each do |nsip| -%>
 nameserver <%= nsip %>
 <% end -%>
 options timeout:2 ndots:2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0341728ae0b97b4d35708ab797a567b2746a32a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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