Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68153
Change subject: Rename upload storage backends to be device name independent
......................................................................
Rename upload storage backends to be device name independent
Change-Id: I45b8067bd663207e5677a04c3b4c596d8bb80c7a
---
M manifests/role/cache.pp
M templates/varnish/upload-backend.inc.vcl.erb
2 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/68153/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 44d41a5..ea6970e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -643,8 +643,8 @@
default => [],
},
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",
+ 'dysprosium' => "-s
main1=persistent,/srv/sdc1/varnish.persist,300G -s
main2=file,/srv/sdd1/varnish.persist,300G -s
bigobj1=file,/srv/sdc1/large-objects.persist,50G -s
bigobj2=file,/srv/sdd1/large-objects.persist,50G",
+ default => "-s
main1=persistent,/srv/sda3/varnish.persist,${storage_size_main}G -s
main2=persistent,/srv/sdb3/varnish.persist,${storage_size_main}G -s
bigobj1=file,/srv/sda3/large-objects.persist,${storage_size_bigobj}G -s
bigobj2=file,/srv/sdb3/large-objects.persist,${storage_size_bigobj}G",
},
directors => $varnish_be_directors[$::site],
director_type => "random",
diff --git a/templates/varnish/upload-backend.inc.vcl.erb
b/templates/varnish/upload-backend.inc.vcl.erb
index 7b08bde..31d8722 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -2,17 +2,17 @@
sub pick_main_stevedore {
if (std.random(0, 2) < 1) {
- set beresp.storage = "main-sda3";
+ set beresp.storage = "main1";
} else {
- set beresp.storage = "main-sdb3";
+ set beresp.storage = "main2";
}
}
sub pick_large_object_stevedore {
if (std.random(0, 2) < 1) {
- set beresp.storage = "bigobj-sda3";
+ set beresp.storage = "bigobj1";
} else {
- set beresp.storage = "bigobj-sdb3";
+ set beresp.storage = "bigobj2";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/68153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45b8067bd663207e5677a04c3b4c596d8bb80c7a
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
