Alex Monk has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402758 )
Change subject: swift: Fix checks on drive/filesystem titles to allow for labs
ones
......................................................................
swift: Fix checks on drive/filesystem titles to allow for labs ones
Added support for the lv- prefix used on deployment-ms-be0[34] machines in
deployment-prep.
Bug: T184236
Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
---
M modules/swift/manifests/init_device.pp
M modules/swift/manifests/mount_filesystem.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/402758/1
diff --git a/modules/swift/manifests/init_device.pp
b/modules/swift/manifests/init_device.pp
index eaca102..8c72c66 100644
--- a/modules/swift/manifests/init_device.pp
+++ b/modules/swift/manifests/init_device.pp
@@ -1,5 +1,5 @@
define swift::init_device($partition_nr='1') {
- if ($title !~ /^([hvs]d[a-z]+|md[0-9]+)$/) {
+ if ($title !~ /^([hvs]d[a-z]+|md[0-9]+|lv\-[a-z]+)$/) {
fail("Invalid name ${title} for swift::init_device")
}
diff --git a/modules/swift/manifests/mount_filesystem.pp
b/modules/swift/manifests/mount_filesystem.pp
index 1a7a86e..38f478d 100644
--- a/modules/swift/manifests/mount_filesystem.pp
+++ b/modules/swift/manifests/mount_filesystem.pp
@@ -1,7 +1,7 @@
define swift::mount_filesystem (
$mount_base = '/srv/swift-storage',
){
- if ($title !~ /^[hvs]d[a-z]+[0-9]+$/) {
+ if ($title !~ /^([hvs]d|lv\-)[a-z]+[0-9]+$/) {
fail("Invalid name ${title} for swift::mount_filesystem")
}
--
To view, visit https://gerrit.wikimedia.org/r/402758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1eb608cf96e2e79a84772faaf7bedae6c0ecfb96
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
