Mark Bergsma has submitted this change and it was merged.
Change subject: Support different backends for 1st/2nd mobile tier
......................................................................
Support different backends for 1st/2nd mobile tier
Change-Id: Id41b9ae6bb8a210aaffbcbd8a52c07f4c4948bda
---
M manifests/role/cache.pp
1 file changed, 12 insertions(+), 5 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4cc5d50..bb53bd2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -914,6 +914,17 @@
include standard,
nrpe
+ $varnish_be_directors = {
+ 1 => {
+ "backend" =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
+ "api" =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
+ "test_wikipedia" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
+ },
+ 2 => {
+ "eqiad" =>
$role::cache::configuration::active_nodes[$::realm]['mobile']['eqiad']
+ }
+ }
+
$storage_size_main = $::hostname ? {
/^cp104[1-4]$/ => 100,
default => 300,
@@ -958,11 +969,7 @@
'esams' => ["prefer_ipv6=on"],
default => [],
},
- directors => {
- "backend" =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
- "api" =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
- "test_wikipedia" =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
- },
+ directors => $varnish_be_directors[$cluster_tier],
director_type => $cluster_tier ? {
1 => 'random',
default => 'chash',
--
To view, visit https://gerrit.wikimedia.org/r/71356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id41b9ae6bb8a210aaffbcbd8a52c07f4c4948bda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
