Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: Fix dynamic scope lookup in templates
......................................................................


Fix dynamic scope lookup in templates

Use of outside-scoped variables in templates does not work in puppet
3. So you need to explicitly look them up the scope with scope.lookupvar
and their absolute namespace specified.

Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M templates/udp2log/filters.nginx.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/udp2log/filters.nginx.erb 
b/templates/udp2log/filters.nginx.erb
index b4bbd66..2d3f7bc 100644
--- a/templates/udp2log/filters.nginx.erb
+++ b/templates/udp2log/filters.nginx.erb
@@ -1,4 +1,4 @@
 # Note: This file is managed by Puppet.
 
 # Save logs from nginx.
-file 100 <%= nginx_log_directory %>/nginx-sampled-100.tsv.log
+file 100 <%= 
scope.lookupvar('role::logging::udp2log::nginx::nginx_log_directory') 
%>/nginx-sampled-100.tsv.log

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic42e1f2da7dc5ba6439084398dfa93b4dd559228
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to