Ema has submitted this change and it was merged.
Change subject: Misc cluster VCL: avoid name conflict between directors and
probes
......................................................................
Misc cluster VCL: avoid name conflict between directors and probes
Add _director suffix to the logstash and wdqs directors in order to
avoid name clashes with Varnish 4: we also have two probes named
logstash and wdqs.
Bug: T131501
Change-Id: I37ccb33e5e5af3c51820a6913bfb807980541596
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc-backend.inc.vcl.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ema: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 39dc8da..0355bfc 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -184,7 +184,7 @@
'backends' => ['ytterbium.wikimedia.org'],
'be_opts' => merge($app_def_be_opts, { 'port' => 8080 }),
},
- 'logstash' => {
+ 'logstash_director' => {
'dynamic' => 'no',
'type' => 'hash', # maybe-wrong? but current value before this
commit! XXX
'backends' => [
@@ -194,7 +194,7 @@
],
'be_opts' => merge($app_def_be_opts, { 'probe' => 'logstash' }),
},
- 'wdqs' => {
+ 'wdqs_director' => {
'dynamic' => 'no',
'type' => 'random',
'backends' => ['wdqs1001.eqiad.wmnet', 'wdqs1002.eqiad.wmnet'],
diff --git a/templates/varnish/misc-backend.inc.vcl.erb
b/templates/varnish/misc-backend.inc.vcl.erb
index 2d3c0e5..13679a4 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -14,9 +14,9 @@
} elsif (req.http.Host == "performance.wikimedia.org" || req.http.Host ==
"graphite.wikimedia.org") {
set req.backend = graphite1001;
} elsif (req.http.Host == "logstash.wikimedia.org"){
- set req.backend = logstash;
+ set req.backend = logstash_director;
} elsif (req.http.Host == "query.wikidata.org"){
- set req.backend = wdqs;
+ set req.backend = wdqs_director;
} elsif (req.http.Host == "releases.wikimedia.org") {
set req.backend = bromine;
} elsif (req.http.Host == "piwik.wikimedia.org") {
--
To view, visit https://gerrit.wikimedia.org/r/281457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37ccb33e5e5af3c51820a6913bfb807980541596
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
