[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish::wikimedia_vcl: explicitly pass $vcl_config

[Ema (Code Review)]

Ema has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376045 )

Change subject: varnish::wikimedia_vcl: explicitly pass $vcl_config
......................................................................

varnish::wikimedia_vcl: explicitly pass $vcl_config

With the future parser, variable scope is respected in templates.
Explicitly pass $vcl_config to varnish::wikimedia_vcl.

Change-Id: I02039293180775270d73520e042a6d90dd94192c
---
M modules/varnish/manifests/instance.pp
M modules/varnish/manifests/wikimedia_vcl.pp
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/376045/1

diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index 4ab9415..9a0d87a 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -83,12 +83,14 @@
         require         => File['/usr/share/varnish/tests'],
         varnish_testing => true,
         template_path   => "${module_name}/vcl/wikimedia-common.inc.vcl.erb",
+        vcl_config      => $vcl_config,
     }
 
     varnish::wikimedia_vcl { "/usr/share/varnish/tests/wikimedia_${vcl}.vcl":
         require         => File['/usr/share/varnish/tests'],
         varnish_testing => true,
         template_path   => "${module_name}/vcl/wikimedia-${layer}.vcl.erb",
+        vcl_config      => $vcl_config,
     }
 
     file { "/etc/varnish/${vcl}.inc.vcl":
@@ -103,6 +105,7 @@
         require         => File['/usr/share/varnish/tests'],
         varnish_testing => true,
         template_path   => "varnish/${vcl}.inc.vcl.erb",
+        vcl_config      => $vcl_config,
     }
 
     # The defaults file is also parsed by /usr/share/varnish/reload-vcl,
diff --git a/modules/varnish/manifests/wikimedia_vcl.pp 
b/modules/varnish/manifests/wikimedia_vcl.pp
index 36a970a..0b82751 100644
--- a/modules/varnish/manifests/wikimedia_vcl.pp
+++ b/modules/varnish/manifests/wikimedia_vcl.pp
@@ -1,4 +1,4 @@
-define varnish::wikimedia_vcl($varnish_testing, $template_path) {
+define varnish::wikimedia_vcl($varnish_testing, $template_path, $vcl_config) {
     if $varnish_testing  {
         $varnish_include_path = '/usr/share/varnish/tests/'
         $dynamic_backend_caches = false

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02039293180775270d73520e042a6d90dd94192c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>

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