BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203562
Change subject: cache.pp cleanup: various format nits
......................................................................
cache.pp cleanup: various format nits
Change-Id: Iba1fa2ddf90b53c4702d9026dadf5e215641cb78
---
M manifests/role/cache.pp
1 file changed, 44 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/203562/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0b2f02e..d8edbeb 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -865,7 +865,8 @@
'first_byte_timeout' => '180s',
'between_bytes_timeout' => '4s',
'max_connections' => 1000,
- }]),
+ },
+ ]),
wikimedia_networks => $wikimedia_networks,
}
@@ -897,7 +898,8 @@
'between_bytes_timeout' => '2s',
'max_connections' => 100000,
'probe' => 'varnish',
- }]),
+ },
+ ]),
cluster_options => {
'enable_geoiplookup' => true,
},
@@ -1050,7 +1052,8 @@
'first_byte_timeout' => '35s',
'between_bytes_timeout' => '4s',
'max_connections' => 1000,
- }]),
+ },
+ ]),
cluster_options => $cluster_options,
wikimedia_networks => $wikimedia_networks,
}
@@ -1081,7 +1084,8 @@
'between_bytes_timeout' => '2s',
'max_connections' => 100000,
'probe' => 'varnish',
- }]),
+ },
+ ]),
cluster_options => $cluster_options,
}
@@ -1125,7 +1129,7 @@
'test_wikipedia' =>
$::role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
2 => {
- 'backend' =>
sort(flatten(values($role::cache::configuration::backends[$::realm]['bits'])))
+ 'backend' =>
sort(flatten(values($role::cache::configuration::backends[$::realm]['bits']))),
}
}
@@ -1240,9 +1244,9 @@
$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],
+ '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'],
@@ -1345,7 +1349,8 @@
'first_byte_timeout' => '180s',
'between_bytes_timeout' => '4s',
'max_connections' => 600,
- }]),
+ },
+ ]),
cluster_options => $cluster_options,
wikimedia_networks => $wikimedia_networks,
}
@@ -1371,15 +1376,16 @@
'layer' => 'frontend',
'ssl_proxies' => $wikimedia_networks,
},
- backend_options => array_concat($backend_scaled_weights, [
- {
- 'port' => 3128,
- 'connect_timeout' => '5s',
- 'first_byte_timeout' => '185s',
- 'between_bytes_timeout' => '2s',
- 'max_connections' => 100000,
- 'probe' => 'varnish',
- }]),
+ backend_options => array_concat($backend_scaled_weights, [
+ {
+ 'port' => 3128,
+ 'connect_timeout' => '5s',
+ 'first_byte_timeout' => '185s',
+ 'between_bytes_timeout' => '2s',
+ 'max_connections' => 100000,
+ 'probe' => 'varnish',
+ },
+ ]),
cluster_options => $cluster_options,
}
@@ -1392,9 +1398,7 @@
if $::realm == 'production' {
# Install a varnishkafka producer to send
# varnish webrequest logs to Kafka.
- class { 'role::cache::kafka::webrequest':
- topic => 'webrequest_mobile',
- }
+ class { 'role::cache::kafka::webrequest': topic => 'webrequest_mobile'
}
}
}
@@ -1492,30 +1496,31 @@
'first_byte_timeout' => '5m',
'between_bytes_timeout' => '20s',
'max_connections' => 10000,
- }],
+ },
+ ],
}
varnish::instance { 'parsoid-frontend':
- name => 'frontend',
- vcl => 'parsoid-frontend',
- extra_vcl => ['parsoid-common'],
- port => 80,
- admin_port => 6082,
- directors => {
+ name => 'frontend',
+ vcl => 'parsoid-frontend',
+ extra_vcl => ['parsoid-common'],
+ port => 80,
+ admin_port => 6082,
+ directors => {
'backend' =>
$::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site],
'cxserver_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['cxserver'][$::site],
'citoid_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['citoid'][$::site],
'restbase_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['restbase'][$::site],
},
- director_type => 'chash',
+ director_type => 'chash',
director_options => {
'retries' => $backend_weight_avg *
size($::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site]),
},
- vcl_config => {
+ vcl_config => {
'retry5xx' => 0,
'ssl_proxies' => $wikimedia_networks,
},
- backend_options => array_concat($backend_scaled_weights, [
+ backend_options => array_concat($backend_scaled_weights, [
{
'backend_match' => '^cxserver',
'port' => 8080,
@@ -1532,13 +1537,14 @@
'probe' => false, # TODO: Need probe here
},
{
- 'port' => 3128,
- 'connect_timeout' => '5s',
- 'first_byte_timeout' => '6m',
- 'between_bytes_timeout' => '20s',
- 'max_connections' => 100000,
- 'probe' => 'varnish',
- }]),
+ 'port' => 3128,
+ 'connect_timeout' => '5s',
+ 'first_byte_timeout' => '6m',
+ 'between_bytes_timeout' => '20s',
+ 'max_connections' => 100000,
+ 'probe' => 'varnish',
+ },
+ ]),
}
}
--
To view, visit https://gerrit.wikimedia.org/r/203562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba1fa2ddf90b53c4702d9026dadf5e215641cb78
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
