Mark Bergsma has submitted this change and it was merged.
Change subject: Prepare the bits cache manifests for the new eqiad servers
......................................................................
Prepare the bits cache manifests for the new eqiad servers
Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
---
M manifests/role/cache.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 85d40b2..f2490d9 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -841,6 +841,12 @@
}
$cluster_options = merge($common_cluster_options,
$realm_cluster_options)
+ if regsubst($::memorytotal, "^([0-9]+)\.[0-9]* GB$", "\1") > 96
{
+ $memory_storage_size = 32
+ } else {
+ $memory_storage_size = 2
+ }
+
system_role { "role::cache::bits": description => "bits Varnish
cache server" }
require geoip
@@ -853,7 +859,7 @@
vcl => "bits",
port => 80,
admin_port => 6082,
- storage => "-s malloc,2G",
+ storage => "-s malloc,${memory_storage_size}G",
directors => $varnish_directors[$cluster_tier],
director_type => "random",
vcl_config => {
--
To view, visit https://gerrit.wikimedia.org/r/70819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic08c9d71773e19b26f3bc37807356ef1c56d0c4f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
