Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68368
Change subject: Add FIXMEs to be dealt with when configuring the new servers
......................................................................
Add FIXMEs to be dealt with when configuring the new servers
Change-Id: I48a393d7d8f698124572b6e990a86b1d0d6cfb68
---
M manifests/role/cache.pp
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/68368/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 957342d..06fbfb0 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -555,6 +555,7 @@
}
}
+ # FIXME: set to (default) 100 on new servers
$backend_weight = 20
if $::site == "eqiad" {
$storage_size_main = 100
@@ -571,6 +572,7 @@
#class { "varnish::packages": version => "3.0.3plus~rc1-wm5" }
+ # FIXME: set to default on new servers
$storage_partitions = $::realm ? {
'production' =>
$::hostname ? {
@@ -594,12 +596,13 @@
'esams' => ["prefer_ipv6=on",
"default_ttl=86400"],
default => [],
},
+ # FIXME: rename on new servers
storage => $::hostname ? {
'dysprosium' => "-s
main-sda1=persistent,/srv/sdc1/varnish.persist,300G -s
main-sdb1=file,/srv/sdd1/varnish.persist,300G -s
bigobj-sda1=file,/srv/sdc1/large-objects.persist,50G -s
bigobj-sdb1=file,/srv/sdd1/large-objects.persist,50G",
default => "-s
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main-sdb3=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G -s
bigobj-sda3=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s
bigobj-sdb3=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
},
directors => $varnish_be_directors[$cluster_tier],
- director_type => "random",
+ director_type => "random", # FIXME: set to chash
on new servers
vcl_config => {
'default_backend' => $default_backend,
'retry5xx' => 0,
@@ -829,6 +832,7 @@
varnish::instance { "mobile-backend":
name => "",
vcl => "mobile-backend",
+ # FIXME: set to 3128 on new servers
port => 81,
admin_port => 6083,
storage => $::realm ? {
@@ -883,6 +887,7 @@
'layer' => 'frontend',
},
backend_options => {
+ # FIXME: set to 3128 for new servers
'port' => 81,
'connect_timeout' => "5s",
'first_byte_timeout' => "35s",
--
To view, visit https://gerrit.wikimedia.org/r/68368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48a393d7d8f698124572b6e990a86b1d0d6cfb68
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
