Madhuvishy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332803 )
Change subject: nfsclient: Create symlinks only if mount_nfs_volume is true
......................................................................
nfsclient: Create symlinks only if mount_nfs_volume is true
Change-Id: I82880c99562b968908d42c2a61e52d57a0c74f3e
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 16 insertions(+), 12 deletions(-)
Approvals:
Madhuvishy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/labs/nfsclient.pp
b/modules/role/manifests/labs/nfsclient.pp
index cbe51b8..a33a9dc 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -54,20 +54,24 @@
}
# FIXME Remove dependency on absent mounts from labstoresvc after migration
- file { '/data/project':
- ensure => 'link',
- force => true,
- target => '/mnt/nfs/labstore-secondary-project',
- require => [Labstore::Nfs_mount['project-on-labstore-secondary'],
- Labstore::Nfs_mount['project-on-labstoresvc']],
+ if mount_nfs_volume($::labsproject, 'project') {
+ file { '/data/project':
+ ensure => 'link',
+ force => true,
+ target => '/mnt/nfs/labstore-secondary-project',
+ require => [Labstore::Nfs_mount['project-on-labstore-secondary'],
+ Labstore::Nfs_mount['project-on-labstoresvc']],
+ }
}
- file { '/home':
- ensure => 'link',
- force => true,
- target => '/mnt/nfs/labstore-secondary-home',
- require => [Labstore::Nfs_mount['home-on-labstore-secondary'],
- Labstore::Nfs_mount['home-on-labstoresvc']],
+ if mount_nfs_volume($::labsproject, 'home') {
+ file { '/home':
+ ensure => 'link',
+ force => true,
+ target => '/mnt/nfs/labstore-secondary-home',
+ require => [Labstore::Nfs_mount['home-on-labstore-secondary'],
+ Labstore::Nfs_mount['home-on-labstoresvc']],
+ }
}
if $::labsproject == 'maps' {
--
To view, visit https://gerrit.wikimedia.org/r/332803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82880c99562b968908d42c2a61e52d57a0c74f3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <[email protected]>
Gerrit-Reviewer: Madhuvishy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
