Andrew Bogott has submitted this change and it was merged.
Change subject: Allow user to specify mount point for role::labs::lvm::mnt
......................................................................
Allow user to specify mount point for role::labs::lvm::mnt
Check for a global variable named `lvm_mount_point` to change the
default mount point from /mnt.
Once this is merged, the variable should be added to the global
labsdrives group on wikitech so instances can use it.
Change-Id: I9c949788f99b2e524086852c3c3201a64dfc2695
---
M manifests/role/labsmnt.pp
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/labsmnt.pp b/manifests/role/labsmnt.pp
index 08ab032..f362803 100644
--- a/manifests/role/labsmnt.pp
+++ b/manifests/role/labsmnt.pp
@@ -1,5 +1,10 @@
-# Allocate all of the instance's extra space as /mnt
+# Allocate all of the instance's extra space as /mnt or the user specified
+# mount point given in the $::lvm_mount_point global variable.
class role::labs::lvm::mnt {
include labs_lvm
- labs_lvm::volume { 'second-local-disk': mountat => '/mnt' }
+ $mount_point = $::lvm_mount_point ? {
+ undef => '/mnt',
+ default => $::lvm_mount_point,
+ }
+ labs_lvm::volume { 'second-local-disk': mountat => $mount_point }
}
--
To view, visit https://gerrit.wikimedia.org/r/119524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c949788f99b2e524086852c3c3201a64dfc2695
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
