Rush has submitted this change and it was merged.
Change subject: nfsclient: Create /data/scratch symlink only if mount is present
......................................................................
nfsclient: Create /data/scratch symlink only if mount is present
Change-Id: I436300eb274b6fa21cee71260403b3ae26684721
---
M modules/role/manifests/labs/nfsclient.pp
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/labs/nfsclient.pp
b/modules/role/manifests/labs/nfsclient.pp
index 8ce12fd..f053b3e 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -46,11 +46,13 @@
lookupcache => $lookupcache,
}
- file { '/data/scratch':
- ensure => 'link',
- target => '/mnt/nfs/labstore1003-scratch',
- require => [Labstore::Nfs_mount['scratch-on-labstoresvc'],
- Labstore::Nfs_mount['scratch-on-labstore1003']],
+ if mount_nfs_volume($::labsproject, 'scratch') {
+ file { '/data/scratch':
+ ensure => 'link',
+ target => '/mnt/nfs/labstore1003-scratch',
+ require => [Labstore::Nfs_mount['scratch-on-labstoresvc'],
+ Labstore::Nfs_mount['scratch-on-labstore1003']],
+ }
}
labstore::nfs_mount { 'dumps-on-labstore1003':
--
To view, visit https://gerrit.wikimedia.org/r/308941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I436300eb274b6fa21cee71260403b3ae26684721
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Chasemp <r...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
