BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274601
Change subject: VCL: remove tier-one conditionals on be applayer backend code
......................................................................
VCL: remove tier-one conditionals on be applayer backend code
These are now defined everywhere, so the code should compile this
way. Note that the cluster_be_recv_applayer_backend hook is still
only called in the $site_tier == "one" case up in
wikimedia-backend.vcl.erb
Bug: T127481
Change-Id: I69edeacbd564c13f1b6863fd8fa03eb3280d7f84
---
M templates/varnish/maps-backend.inc.vcl.erb
M templates/varnish/misc-backend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/upload-backend.inc.vcl.erb
4 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/274601/1
diff --git a/templates/varnish/maps-backend.inc.vcl.erb
b/templates/varnish/maps-backend.inc.vcl.erb
index 7067443..c7ec519 100644
--- a/templates/varnish/maps-backend.inc.vcl.erb
+++ b/templates/varnish/maps-backend.inc.vcl.erb
@@ -1,10 +1,8 @@
// Varnish VCL include file for maps backends
-<% if @site_tier == "one" -%>
sub cluster_be_recv_applayer_backend {
set req.backend = kartotherian;
}
-<% end -%>
sub cluster_be_recv { }
sub cluster_be_hash { }
diff --git a/templates/varnish/misc-backend.inc.vcl.erb
b/templates/varnish/misc-backend.inc.vcl.erb
index 9fe005e..d1033e8 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -1,6 +1,5 @@
include "misc-common.inc.vcl";
-<% if @site_tier == "one" -%>
sub cluster_be_recv_applayer_backend {
if (req.http.Host == "git.wikimedia.org") {
set req.backend = antimony;
@@ -64,7 +63,6 @@
error 404 "Domain not served here";
}
}
-<% end -%>
sub cluster_be_recv {
call misc_recv_pass;
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index f94bb39..a9fac4e 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -2,7 +2,6 @@
include "text-common.inc.vcl";
-<% if @site_tier == "one" -%>
sub cluster_be_recv_applayer_backend {
if (req.url ~ "^/w/api\.php") {
if (req.http.X-Wikimedia-Debug == "1") {
@@ -39,7 +38,6 @@
}
<% end %>
}
-<% end %> // end site_tier == one
sub cluster_be_recv {
call text_common_recv;
diff --git a/templates/varnish/upload-backend.inc.vcl.erb
b/templates/varnish/upload-backend.inc.vcl.erb
index 279fa2f..d595e2a 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -17,11 +17,9 @@
}
}
-<% if @site_tier == "one" -%>
sub cluster_be_recv_applayer_backend {
set req.backend = swift;
}
-<% end -%>
sub cluster_be_recv {
call upload_common_recv;
--
To view, visit https://gerrit.wikimedia.org/r/274601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69edeacbd564c13f1b6863fd8fa03eb3280d7f84
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
