Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220552
Change subject: Pybal: switching to confd sourced pool
......................................................................
Pybal: switching to confd sourced pool
* Allows specified site/node combo
* Will affect codfw/lvs2001
Change-Id: I3bbaad3648bebbc74f6faa81cec8e142afd8b3e8
---
M modules/pybal/templates/pybal.conf.erb
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/220552/1
diff --git a/modules/pybal/templates/pybal.conf.erb
b/modules/pybal/templates/pybal.conf.erb
index 83cc321..7c294bf 100644
--- a/modules/pybal/templates/pybal.conf.erb
+++ b/modules/pybal/templates/pybal.conf.erb
@@ -28,8 +28,18 @@
ip = <%= subserviceip %>
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'] %>
+<% 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 %>
-# config = file:///etc/pybal/pools/<%= servicename %>
+<% end %>
+<%# End Temp logic but 'config =' reference will remain post (obviously) %>
+
bgp = <%= service.fetch('bgp', "no") %>
depool-threshold = <%= service.fetch('depool-threshold', ".5") %>
monitors = <%= service['monitors'].keys.sort.inspect %>
--
To view, visit https://gerrit.wikimedia.org/r/220552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bbaad3648bebbc74f6faa81cec8e142afd8b3e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
