BBlack has submitted this change and it was merged.
Change subject: cache_(text|upload): remove runtime_params conditional
......................................................................
cache_(text|upload): remove runtime_params conditional
Change-Id: Ifcd565e4cd5b281a9882b114b9a11fa665678106
---
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
2 files changed, 2 insertions(+), 12 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 4ec99a6..6e62880 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -77,18 +77,13 @@
include varnish::monitoring::ganglia::vhtcpd
}
- $runtime_params = $::site ? {
- #'esams' => ['prefer_ipv6=on','default_ttl=2592000'],
- default => ['default_ttl=2592000'],
- }
-
varnish::instance { 'text-backend':
name => '',
vcl => 'text-backend',
extra_vcl => ['text-common'],
port => 3128,
admin_port => 6083,
- runtime_parameters => $runtime_params,
+ runtime_parameters => ['default_ttl=2592000'],
storage => $::role::cache::2layer::persistent_storage_args,
directors => $varnish_be_directors[$::site_tier],
vcl_config => {
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 715e7af..3c9f3ef 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -55,11 +55,6 @@
'https_redirects' => true,
}
- $runtime_params = $::site ? {
- #'esams' => ['prefer_ipv6=on','default_ttl=2592000'],
- default => ['default_ttl=2592000'],
- }
-
$storage_size_bigobj = floor($::role::cache::2layer::storage_size / 6)
$storage_size_up = $::role::cache::2layer::storage_size -
$storage_size_bigobj
$upload_storage_args = join([
@@ -74,7 +69,7 @@
vcl => 'upload-backend',
port => 3128,
admin_port => 6083,
- runtime_parameters => $runtime_params,
+ runtime_parameters => ['default_ttl=2592000'],
storage => $upload_storage_args,
directors => $varnish_be_directors[$::site_tier],
vcl_config => {
--
To view, visit https://gerrit.wikimedia.org/r/230807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcd565e4cd5b281a9882b114b9a11fa665678106
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
