Herron has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386899 )
Change subject: puppet: update hiera function call in thumbor nginx template ...................................................................... puppet: update hiera function call in thumbor nginx template function_hiera breaks under puppet 4. update to call_function. Bug: T179178 Change-Id: Ie8f65f42522aee4260fb75f3b5b1e4568f02970d --- M modules/thumbor/templates/nginx.conf.erb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/99/386899/1 diff --git a/modules/thumbor/templates/nginx.conf.erb b/modules/thumbor/templates/nginx.conf.erb index 4873865..6baa897 100644 --- a/modules/thumbor/templates/nginx.conf.erb +++ b/modules/thumbor/templates/nginx.conf.erb @@ -1,4 +1,4 @@ -<%- if scope.function_hiera(['nginx::variant']) == 'extras' -%> +<%- if scope.call_function(:hiera, ['nginx::variant']) == 'extras' -%> lua_shared_dict prometheus_metrics 10M; lua_package_path "/etc/nginx/prometheus.lua"; @@ -55,7 +55,7 @@ add_header X-Upstream $upstream_addr; } -<%- if scope.function_hiera(['nginx::variant']) == 'extras' -%> +<%- if scope.call_function(:hiera, ['nginx::variant']) == 'extras' -%> location /metrics { content_by_lua ' metric_connections:set(ngx.var.connections_reading, {"reading"}) -- To view, visit https://gerrit.wikimedia.org/r/386899 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8f65f42522aee4260fb75f3b5b1e4568f02970d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Herron <kher...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits