Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283194
Change subject: Install test version of ${vcl}.inc.vcl.erb
......................................................................
Install test version of ${vcl}.inc.vcl.erb
We already ship test-specific versions of certain VCL files such as
wikimedia-common_${vcl}.inc.vcl and wikimedia_${vcl}.vcl.
Add ${vcl}.inc.vcl.erb (eg: misc-backend.inc.vcl.erb) to the set of VCL
files we can override for testing purposes.
Change-Id: I882faad49ccd942abd0fa0dc30fd6463fe0611ac
---
M modules/varnish/manifests/instance.pp
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
3 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/283194/1
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index fe94684..4f5de77 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -173,6 +173,12 @@
notify => Exec["load-new-vcl-file${instancesuffix}"],
}
+ varnish::wikimedia_vcl { "/usr/share/varnish/tests/${vcl}.inc.vcl":
+ require => File['/usr/share/varnish/tests'],
+ varnish_testing => true,
+ template_path => "varnish/${vcl}.inc.vcl.erb",
+ }
+
# The defaults file is also parsed by /usr/share/varnish/reload-vcl,
# even under systemd where the init part itself does not. This
# situation should be cleaned up later after all varnishes are on
diff --git a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
index 7a5c6ae..5515694 100644
--- a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
@@ -6,7 +6,7 @@
include "<%= @varnish_include_path %>wikimedia-common_<%= @vcl %>.inc.vcl";
/* Include the VCL file for this role */
-include "<%= @vcl %>.inc.vcl";
+include "<%= @varnish_include_path %><%= @vcl %>.inc.vcl";
sub vcl_init {
call wm_common_directors_init;
diff --git a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
index 3dc35af..8c1f067 100644
--- a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
@@ -13,7 +13,7 @@
include "analytics.inc.vcl";
/* Include the VCL file for this role */
-include "<%= @vcl %>.inc.vcl";
+include "<%= @varnish_include_path %><%= @vcl %>.inc.vcl";
// start HTTPS block
<% if @vcl_config.fetch("https_redirects", false) -%>
--
To view, visit https://gerrit.wikimedia.org/r/283194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I882faad49ccd942abd0fa0dc30fd6463fe0611ac
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
