BBlack has submitted this change and it was merged.
Change subject: rename varnish backends more-explicitly
......................................................................
rename varnish backends more-explicitly
The old way gave name transforms such as:
10.2.2.1 -> ipv4_10_2_2_1
rendering.svc.eqiad.wmnet -> rendering
The primary issue here is that "backends" and "directors" can both be used as
values for req.backend and share a namespace, so this commonly creates a
situation where director "rendering" contains backend "rendering", which fails
to compile
The new way gives an explicit "be_" prefix to non-IPv4, non-director backends
as in:
10.2.2.1 -> ipv4_10_2_2_1
rendering.svc.eqiad.wmnet -> be_rendering
Change-Id: Iee790dec0222aecc32dd33b08976b39a4fc21ff8
---
M modules/varnish/templates/vcl/directors.vcl.tpl.erb
M modules/varnish/templates/vcl/wikimedia.vcl.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/vcl/directors.vcl.tpl.erb
b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
index fce4e09..f489274 100644
--- a/modules/varnish/templates/vcl/directors.vcl.tpl.erb
+++ b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
@@ -22,7 +22,7 @@
<% end -%>
{{range $node := ls "<%= keyspace %>/"}}{{ $key := printf "<%= keyspace
%>/%s" $node }}{{ $data := json (getv $key) }}{{ if eq $data.pooled "yes"}}
{
- .backend = {{ $parts := split $node "." }}{{ index $parts 0 }};
+ .backend = be_{{ $parts := split $node "." }}{{ index $parts 0
}};
.weight = {{ $data.weight }};
}{{end}}{{end}}
}
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 2b44bcd..7f190cb 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -95,7 +95,7 @@
# List of Puppet generated backends
<%
@varnish_backends.each do |backend|
- name = /^[0-9\.]+$/.match(backend) ? "ipv4_" + backend.gsub(".", "_") :
backend.split(".")[0].gsub("-", "_")
+ name = /^[0-9\.]+$/.match(backend) ? "ipv4_" + backend.gsub(".", "_") :
"be_" + backend.split(".")[0].gsub("-", "_")
probe = backend_option(backend, "probe", nil)
-%>
backend <%= name %> {
@@ -140,7 +140,7 @@
<% end -%>
<%
backends.each do |backend|
- name = /^[0-9\.]+$/.match(backend) ? "ipv4_" +
backend.gsub(".", "_") : backend.split(".")[0].gsub("-", "_")
+ name = /^[0-9\.]+$/.match(backend) ? "ipv4_" +
backend.gsub(".", "_") : "be_" + backend.split(".")[0].gsub("-", "_")
-%>
{
.backend = <%= name %>;
--
To view, visit https://gerrit.wikimedia.org/r/230687
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee790dec0222aecc32dd33b08976b39a4fc21ff8
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
