ArielGlenn has submitted this change and it was merged.
Change subject: wrong fix for torrus cache aggregation, trying again
......................................................................
wrong fix for torrus cache aggregation, trying again
Change-Id: I83a6f4bcf0904b651bba962b1a16270f0ea071c1
---
M templates/torrus/cdn-aggregates.xml.erb
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/torrus/cdn-aggregates.xml.erb
b/templates/torrus/cdn-aggregates.xml.erb
index b94593e..f8e1fc5 100644
--- a/templates/torrus/cdn-aggregates.xml.erb
+++ b/templates/torrus/cdn-aggregates.xml.erb
@@ -6,9 +6,14 @@
return
scope.lookupvar("role::cache::configuration::decommissioned_nodes")[role][site]
+ scope.lookupvar("role::cache::configuration::active_nodes")[realm][role][site]
end
+def node_list_squid(role, site)
+ realm = scope.lookupvar('::realm')
+ return
scope.lookupvar("role::cache::configuration::decommissioned_nodes")[role][site]
+
scope.lookupvar("role::cache::configuration::active_nodes")[realm][role][site+'-squid']
+end
+
def squid_rpn(role, site, list=nil)
result = ""
- list = node_list(role, site+'-squid') if list == nil
+ list = node_list_squid(role, site) if list == nil
list.each do |node|
result <<
"{/Squids/#{site}/#{role}/#{node}/%layer%/%squidmetric%},"
end
@@ -39,7 +44,7 @@
</param>
<param name="expr-Squid_api_pmtpa">
-<%= squid_rpn('text', 'pmtpa', node_list('api', 'pmtpa'+'-squid')) %>
+<%= squid_rpn('text', 'pmtpa', node_list_squid('api', 'pmtpa')) %>
</param>
<param name="expr-Squid_upload_pmtpa">
@@ -51,7 +56,7 @@
</param>
<param name="expr-Squid_api_eqiad">
-<%= squid_rpn('text', 'eqiad', node_list('api', 'eqiad'+'-squid')) %>
+<%= squid_rpn('text', 'eqiad', node_list_squid('api', 'eqiad')) %>
</param>
<param name="expr-Squid_text_esams">
--
To view, visit https://gerrit.wikimedia.org/r/79330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83a6f4bcf0904b651bba962b1a16270f0ea071c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
