Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232265
Change subject: pybal: revert use of confd-generated files in codfw
......................................................................
pybal: revert use of confd-generated files in codfw
We are not going to use it, so no reason to leave some nodes active like
that in codfw
Change-Id: I99b01d576ba5cdb0e501a0b7e1ef3456bd5f8012
---
M modules/pybal/templates/pybal.conf.erb
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/232265/1
diff --git a/modules/pybal/templates/pybal.conf.erb
b/modules/pybal/templates/pybal.conf.erb
index 457483e..1dec296 100644
--- a/modules/pybal/templates/pybal.conf.erb
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -35,16 +35,7 @@
port = <%= service.fetch('port', 80) %>
scheduler = <%= service.fetch('scheduler', "wrr") %>
-<%# Temp logic strictly for switchover to Etcd %>
-<%# Opt in site and node combo to set to active for node pools %>
-<% $etcd_sites = ['codfw'] %>
-<% $etcd_nodes = ['lvs2001', 'lvs2004', 'lvs2002', 'lvs2005', 'lvs2003',
'lvs2006'] %>
-<% if $etcd_sites.include?(@site) and
$etcd_nodes.include?(scope.lookupvar("::hostname")) then -%>
-config = file:///etc/pybal/pools/<%= servicename %>
-<% else %>
config = http://config-master.<%= @site %>.wmnet/pybal/<%= @site %>/<%=
servicename %>
-<% end %>
-<%# End Temp logic but 'config =' reference will remain post (obviously) %>
bgp = <%= service.fetch('bgp', "no") %>
depool-threshold = <%= service.fetch('depool-threshold', ".5") %>
--
To view, visit https://gerrit.wikimedia.org/r/232265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99b01d576ba5cdb0e501a0b7e1ef3456bd5f8012
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
