Ema has submitted this change and it was merged.
Change subject: common VCL: use FQDN for backend naming
......................................................................
common VCL: use FQDN for backend naming
Replace '.' with '_' in the backend FQDN and use that as the backend
name.
Bug: T138546
Change-Id: I26f857daa543be25ce969827fc92b754c3731787
---
M modules/varnish/templates/vcl/directors.vcl.tpl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/directors.vcl.tpl.erb
b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
index fd2cbb9..e30c90e 100644
--- a/modules/varnish/templates/vcl/directors.vcl.tpl.erb
+++ b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
@@ -23,7 +23,7 @@
<% end -%>
{{range $node := ls "<%= keyspace %>/"}}{{ $key := printf "<%= keyspace
%>/%s" $node }}{{ $data := json (getv $key) }}{{ if eq $data.pooled "yes"}}
{
- .backend = be_{{ $parts := split $node "." }}{{ index $parts 0
}};
+ .backend = be_{{ $parts := split $node "." }}{{ join $parts "_"
}};
.weight = {{ $data.weight }};
}{{end}}{{end}}
}
@@ -36,9 +36,9 @@
<%- keyspace =
"#{@conftool_namespace}/#{director['dc']}/#{@group}/#{director['service']}" -%>
{{range $node := ls "<%= keyspace %>/"}}{{ $key := printf "<%= keyspace
%>/%s" $node }}{{ $data := json (getv $key) }}{{ if eq $data.pooled "yes"}}
<% if director['type'] == 'vslp' -%>
- <%= director_name %>.add_backend(be_{{ $parts := split $node "." }}{{
index $parts 0 }});
+ <%= director_name %>.add_backend(be_{{ $parts := split $node "." }}{{ join
$parts "_" }});
<% else -%>
- <%= director_name %>.add_backend(be_{{ $parts := split $node "." }}{{
index $parts 0 }}, {{ $data.weight }});
+ <%= director_name %>.add_backend(be_{{ $parts := split $node "." }}{{ join
$parts "_" }}, {{ $data.weight }});
<% end -%>
{{end}}{{end}}
<% if director['type'] == 'vslp' -%>
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index 932b554..bf6224d 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -145,7 +145,7 @@
[*director['backends']].each do |backend|
next if be_seen.key?(backend)
be_seen[backend] = 1
- name = /^[0-9\.]+$/.match(backend) ? "ipv4_" +
backend.gsub(".", "_") : "be_" + backend.split(".")[0].gsub("-", "_")
+ name = 'be_' + backend.gsub(/[-.]/, '_')
-%>
<% if not @varnish_testing -%>
@@ -201,7 +201,7 @@
<% end -%>
<%
backends.each do |backend|
- name = /^[0-9\.]+$/.match(backend) ? "ipv4_" +
backend.gsub(".", "_") : "be_" + backend.split(".")[0].gsub("-", "_")
+ name = 'be_' + backend.gsub(/[-.]/, '_')
# Override backend name for test VCL files. This way we can use
# "vtc_backend" as the backend name in our VTC tests.
--
To view, visit https://gerrit.wikimedia.org/r/276529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26f857daa543be25ce969827fc92b754c3731787
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
