Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57749
Change subject: Add configuration for dysprosium (varnish performance test box)
......................................................................
Add configuration for dysprosium (varnish performance test box)
Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/57749/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5f5b31e..99e9f45 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -419,7 +419,11 @@
#class { "varnish::packages": version =>
"3.0.3plus~rc1-wm5" }
- varnish::setup_filesystem{ ["sda3", "sdb3"]:
+ varnish::setup_filesystem{
+ $::hostname ? {
+ 'dysprosium' => ["sdc1", "sdd1"],
+ default => ["sda3", "sdb3"]
+ }:
before => Varnish::Instance["upload-backend"]
}
@@ -438,6 +442,7 @@
default => [],
},
storage => $::hostname ? {
+ 'dysprosium' => "-s
main-sdc1=persistent,/srv/sdc1/varnish.persist,300G -s
main-sdd1=file,/srv/sdd1/varnish.persist,300G -s
bigobj-sdc1=file,/srv/sdc1/large-objects.persist,50G -s
bigobj-sdd1=file,/srv/sdd1/large-objects.persist,50G",
/^cp30[0-9][0-9]$/ => "-s
main-sda3=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main-sdb3=file,/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",
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",
},
diff --git a/manifests/site.pp b/manifests/site.pp
index 66f1f9a..e29d07a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -707,6 +707,10 @@
}
}
+node "dysprosium.eqiad.wmnet" {
+ include role::cache::upload
+}
+
node "ekrem.wikimedia.org" {
include standard,
misc::irc-server,
--
To view, visit https://gerrit.wikimedia.org/r/57749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If285b6df7e491d41cf593ae89d6b98fb0f759c34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
