Mark Bergsma has submitted this change and it was merged.
Change subject: "enable_esi" setting to the mobile beta labs varnish
......................................................................
"enable_esi" setting to the mobile beta labs varnish
The new option is passed to varnish::instance classes using the
$cluster_options parameter. It is being done only to the mobile cache.
Change-Id: I384a9f741c78f005b8b038d73e8f7ce7555f8b41
---
M manifests/role/cache.pp
1 file changed, 14 insertions(+), 0 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 4b29f6a..ffdbb12 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -957,6 +957,18 @@
include varnish::monitoring::ganglia::vhtcpd
+ case $::realm {
+ 'production': {
+ $cluster_options = {
+ }
+ }
+ 'labs': {
+ $cluster_options = {
+ 'enable_esi' => true,
+ }
+ }
+ }
+
varnish::netmapper_update {
'zero.json': url =>
'http://meta.wikimedia.org/w/api.php?action=zeroconfig&type=ips';
}
@@ -1009,6 +1021,7 @@
'between_bytes_timeout' => "4s",
'max_connections' => 600,
}],
+ cluster_options => $cluster_options,
wikimedia_networks => $wikimedia_networks,
}
@@ -1043,6 +1056,7 @@
'max_connections' => 100000,
'probe' => "varnish",
}],
+ cluster_options => $cluster_options,
}
include role::cache::varnish::logging
--
To view, visit https://gerrit.wikimedia.org/r/90095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I384a9f741c78f005b8b038d73e8f7ce7555f8b41
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Hashar <[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
