Mark Bergsma has submitted this change and it was merged.
Change subject: Rename $storage_backends var to the more descriptive
$storage_partitions
......................................................................
Rename $storage_backends var to the more descriptive $storage_partitions
Change-Id: Id42b964851df83a7e4c7be8690022b1ebd9e36b2
---
M manifests/role/cache.pp
1 file changed, 8 insertions(+), 8 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 0bbaf49..4eab483 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -449,11 +449,11 @@
#class { "varnish::packages": version =>
"3.0.3plus~rc1-wm5" }
- $storage_backends = $::realm ? {
+ $storage_partitions = $::realm ? {
'production' => ["sda3", "sdb3"],
'labs' => ["vdb"],
}
- varnish::setup_filesystem{ $storage_backends:
+ varnish::setup_filesystem{ $storage_partitions:
before => Varnish::Instance["text-backend"]
}
@@ -617,14 +617,14 @@
#class { "varnish::packages": version =>
"3.0.3plus~rc1-wm5" }
- $storage_backends = $::realm ? {
+ $storage_partitions = $::realm ? {
'production' =>
$::hostname ? {
'dysprosium' => ['sdc1',
'sdd1'],
default => ['sda3', 'sdb3'],
},
}
- varnish::setup_filesystem{ $storage_backends:
+ varnish::setup_filesystem{ $storage_partitions:
before => Varnish::Instance["upload-backend"]
}
@@ -862,11 +862,11 @@
include standard,
nrpe
- $storage_backends = $::realm ? {
+ $storage_partitions = $::realm ? {
'production' => ["sda3", "sdb3"],
'labs' => ["vdb"],
}
- varnish::setup_filesystem{ $storage_backends:
+ varnish::setup_filesystem{ $storage_partitions:
before => Varnish::Instance["mobile-backend"]
}
@@ -966,7 +966,7 @@
include standard,
nrpe
- $storage_backends = $::realm ? {
+ $storage_partitions = $::realm ? {
'production' => $::hostname ? {
# FIXME: Use consistent partitions on the new
servers
"titanium" => ["sdb1", "sdd1"],
@@ -975,7 +975,7 @@
},
'labs' => ["vdb"],
}
- varnish::setup_filesystem{ $storage_backends:
+ varnish::setup_filesystem{ $storage_partitions:
before => Varnish::Instance["parsoid-backend"]
}
--
To view, visit https://gerrit.wikimedia.org/r/68162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id42b964851df83a7e4c7be8690022b1ebd9e36b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[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
