BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339671 )
Change subject: varnish: move applayer info back to hiera [WIP, 4/4]
......................................................................
varnish: move applayer info back to hiera [WIP, 4/4]
XXX Just maps so far, TODO rest...
Bug: T134404
Change-Id: Ica27010fa9a453aae96810ec52754a75410adfbd
---
M hieradata/role/common/cache/maps.yaml
M modules/role/manifests/cache/maps.pp
2 files changed, 16 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/339671/1
diff --git a/hieradata/role/common/cache/maps.yaml
b/hieradata/role/common/cache/maps.yaml
index 835d136..b2113fa 100644
--- a/hieradata/role/common/cache/maps.yaml
+++ b/hieradata/role/common/cache/maps.yaml
@@ -14,3 +14,16 @@
codfw: 'eqiad'
ulsfo: 'codfw'
esams: 'eqiad'
+cache::app_def_be_opts:
+ port: 6533
+ connect_timeout: '5s'
+ first_byte_timeout: '35s'
+ max_connections: 1000
+cache::app_directors:
+ kartotherian:
+ backends:
+ eqiad: 'kartotherian.svc.eqiad.wmnet'
+ # codfw: 'kartotherian.svc.codfw.wmnet'
+cache::req_handling:
+ default:
+ director: 'kartotherian'
diff --git a/modules/role/manifests/cache/maps.pp
b/modules/role/manifests/cache/maps.pp
index bbcdc37..0c090a5 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -29,32 +29,11 @@
'probe' => 'varnish',
}
- $app_def_be_opts = {
- 'port' => 6533,
- 'connect_timeout' => '5s',
- 'first_byte_timeout' => '35s',
- 'max_connections' => 1000,
- }
-
- $app_directors = {
- 'kartotherian' => {
- 'backends' => {
- 'eqiad' => 'kartotherian.svc.eqiad.wmnet',
- },
- },
- }
-
- $req_handling = {
- 'default' => {
- 'director' => 'kartotherian',
- },
- }
-
$common_vcl_config = {
'purge_host_regex' => $::role::cache::base::purge_host_not_upload_re,
'ttl_cap' => '1d',
'pass_random' => true,
- 'req_handling' => $req_handling,
+ 'req_handling' => hiera('cache::req_handling'),
}
$common_runtime_params = ['default_ttl=86400']
@@ -64,8 +43,8 @@
fe_jemalloc_conf => 'lg_dirty_mult:8,lg_chunk:17',
fe_runtime_params => $common_runtime_params,
be_runtime_params => $common_runtime_params,
- app_directors => $app_directors,
- app_def_be_opts => $app_def_be_opts,
+ app_directors => hiera('cache::app_directors'),
+ app_def_be_opts => hiera('cache::app_def_be_opts'),
fe_vcl_config => $common_vcl_config,
be_vcl_config => $common_vcl_config,
fe_extra_vcl => [],
--
To view, visit https://gerrit.wikimedia.org/r/339671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica27010fa9a453aae96810ec52754a75410adfbd
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
