BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266489
Change subject: cache_parsoid: use local backends in codfw
......................................................................
cache_parsoid: use local backends in codfw
note: these backend svc hostnames likely don't exist yet...
Change-Id: If5cf6cbfeb25574085c1ca0acd27df52de0a0cf4
---
M modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/parsoid.pp
2 files changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/266489/1
diff --git a/modules/role/manifests/cache/configuration.pp
b/modules/role/manifests/cache/configuration.pp
index 2d78a17..ca403c49 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -22,18 +22,23 @@
},
'parsoid' => {
'eqiad' => ['parsoid.svc.eqiad.wmnet'],
+ 'codfw' => ['parsoid.svc.codfw.wmnet'],
},
'cxserver' => {
'eqiad' => ['cxserver.svc.eqiad.wmnet'],
+ 'codfw' => ['cxserver.svc.codfw.wmnet'],
},
'citoid' => {
'eqiad' => ['citoid.svc.eqiad.wmnet'],
+ 'codfw' => ['citoid.svc.codfw.wmnet'],
},
'graphoid' => {
'eqiad' => ['graphoid.svc.eqiad.wmnet'],
+ 'codfw' => ['graphoid.svc.codfw.wmnet'],
},
'restbase' => {
'eqiad' => ['restbase.svc.eqiad.wmnet'],
+ 'codfw' => ['restbase.svc.codfw.wmnet'],
},
'swift' => {
'eqiad' => ['ms-fe.svc.eqiad.wmnet'],
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index f405aea..7c5b5bb 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -42,7 +42,7 @@
'backend' => {
'dynamic' => 'no',
'type' => 'hash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['parsoid'][$::mw_primary],
+ 'backends' =>
$::role::cache::configuration::backends[$::realm]['parsoid'][$::site],
}
},
vcl_config => $be_vcl_config,
@@ -92,22 +92,22 @@
'cxserver_backend' => {
'dynamic' => 'no',
'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::mw_primary],
+ 'backends' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::site],
},
'citoid_backend' => {
'dynamic' => 'no',
'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::mw_primary],
+ 'backends' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::site],
},
'graphoid_backend' => {
'dynamic' => 'no',
'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['graphoid'][$::mw_primary],
+ 'backends' =>
$::role::cache::configuration::backends[$::realm]['graphoid'][$::site],
},
'restbase_backend' => {
'dynamic' => 'no',
'type' => 'chash', # probably wrong, but current value
before this commit! XXX
- 'backends' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::mw_primary],
+ 'backends' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::site],
},
},
vcl_config => $fe_vcl_config,
--
To view, visit https://gerrit.wikimedia.org/r/266489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5cf6cbfeb25574085c1ca0acd27df52de0a0cf4
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
