BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266741
Change subject: cache_parsoid: remove citoid+cxserver pass-through
......................................................................
cache_parsoid: remove citoid+cxserver pass-through
These are moved to cache_text in parent commit. DNS move and
verification required first!
Bug: T110476
Bug: T110478
Change-Id: Iad855a64e2a33f75208f58000e92050e9fe1fe1e
---
M modules/role/manifests/cache/parsoid.pp
M templates/varnish/parsoid-frontend.inc.vcl.erb
2 files changed, 0 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/266741/1
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index 06f970c..c3bd0fd 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -48,16 +48,6 @@
vcl_config => $be_vcl_config,
backend_options => [
{
- 'backend_match' => '^cxserver',
- 'port' => 8080,
- 'probe' => false,
- },
- {
- 'backend_match' => '^citoid',
- 'port' => 1970,
- 'probe' => false,
- },
- {
'backend_match' => '^restbase',
'port' => 7231,
'probe' => false, # TODO: Need probe here
@@ -84,16 +74,6 @@
'type' => 'chash',
'backends' => $site_cluster_nodes,
},
- 'cxserver_backend' => {
- 'dynamic' => 'no',
- 'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::mw_primary],
- },
- 'citoid_backend' => {
- 'dynamic' => 'no',
- 'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::mw_primary],
- },
'restbase_backend' => {
'dynamic' => 'no',
'type' => 'chash', # probably wrong, but current value
before this commit! XXX
@@ -102,16 +82,6 @@
},
vcl_config => $fe_vcl_config,
backend_options =>
array_concat($::role::cache::2layer::backend_scaled_weights, [
- {
- 'backend_match' => '^cxserver',
- 'port' => 8080,
- 'probe' => false,
- },
- {
- 'backend_match' => '^citoid',
- 'port' => 1970,
- 'probe' => false,
- },
{
'backend_match' => '^restbase',
'port' => 7231,
diff --git a/templates/varnish/parsoid-frontend.inc.vcl.erb
b/templates/varnish/parsoid-frontend.inc.vcl.erb
index 4d6c87b..d833915 100644
--- a/templates/varnish/parsoid-frontend.inc.vcl.erb
+++ b/templates/varnish/parsoid-frontend.inc.vcl.erb
@@ -1,14 +1,6 @@
// Varnish VCL include file for Parsoid frontends
sub vcl_recv {
- if (req.http.Host ~ "cxserver" ) {
- set req.backend = cxserver_backend;
- return (pass);
- }
- if (req.http.Host ~ "citoid" ) {
- set req.backend = citoid_backend;
- return (pass);
- }
if (req.http.Host ~ "restbase" || req.http.Host ~ "rest\." ) {
set req.backend = restbase_backend;
return (pass);
--
To view, visit https://gerrit.wikimedia.org/r/266741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad855a64e2a33f75208f58000e92050e9fe1fe1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
