Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/87337
Change subject: Reverse order of class / sites check ...................................................................... Reverse order of class / sites check Some classes are completely irrelevant for some sites. By changing the order we don't need to handle each site in every class. Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163 --- M modules/pybal/templates/pybal.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/37/87337/1 diff --git a/modules/pybal/templates/pybal.conf.erb b/modules/pybal/templates/pybal.conf.erb index ad85fdc..f63d79d 100644 --- a/modules/pybal/templates/pybal.conf.erb +++ b/modules/pybal/templates/pybal.conf.erb @@ -14,7 +14,7 @@ # <% lvs_services.sort.each do |servicename, service| -%> -<% if lvs_class_hosts[service['class']].include?(scope.lookupvar("::hostname")) and service['sites'].include?(site) then -%> +<% if service['sites'].include?(site) and lvs_class_hosts[service['class']].include?(scope.lookupvar("::hostname")) then -%> <% if service['ip'].class.eql?(String) then service['ip'] = { servicename => service['ip'] } end -%> -- To view, visit https://gerrit.wikimedia.org/r/87337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibebc56cbfecd2a808d5a216d9bbc045120080163 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits