Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298021
Change subject: labs: Allow explicitly specifying lookupcache via hiera
......................................................................
labs: Allow explicitly specifying lookupcache via hiera
Bug: T139769
Change-Id: I9458334ff21f5646ff1ade2f5885e16966f6bad4
---
M modules/labstore/manifests/nfs_mount.pp
M modules/role/manifests/labs/nfsclient.pp
2 files changed, 29 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/298021/1
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index 7021f84..91c753d 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -38,6 +38,7 @@
$options = [],
$block=false,
$block_timeout = 180,
+ $lookupcache='none',
)
{
@@ -50,7 +51,7 @@
'proto=tcp',
'port=0',
'noatime',
- 'lookupcache=none',
+ "lookupcache=${lookupcache}",
'nofsc',
]
diff --git a/modules/role/manifests/labs/nfsclient.pp
b/modules/role/manifests/labs/nfsclient.pp
index 0d959bb..df3e4f3 100644
--- a/modules/role/manifests/labs/nfsclient.pp
+++ b/modules/role/manifests/labs/nfsclient.pp
@@ -1,41 +1,46 @@
class role::labs::nfsclient(
$mode = 'hard',
+ $lookupcache = 'none',
) {
$nfs_server = 'labstore.svc.eqiad.wmnet'
$misc_nfs = 'labstore1003.eqiad.wmnet'
labstore::nfs_mount { 'project':
- project => $::labsproject,
- options => ['rw', $mode],
- mount_path => '/data/project',
- share_path => "/project/${::labsproject}/project",
- server => $nfs_server,
- block => true,
+ project => $::labsproject,
+ options => ['rw', $mode],
+ mount_path => '/data/project',
+ share_path => "/project/${::labsproject}/project",
+ server => $nfs_server,
+ block => true,
+ lookupcache => $lookupcache,
}
labstore::nfs_mount { 'home':
- project => $::labsproject,
- options => ['rw', 'hard'],
- mount_path => '/home',
- share_path => "/project/${::labsproject}/home",
- server => $nfs_server,
- block => true,
+ project => $::labsproject,
+ options => ['rw', 'hard'],
+ mount_path => '/home',
+ share_path => "/project/${::labsproject}/home",
+ server => $nfs_server,
+ block => true,
+ lookupcache => $lookupcache,
}
labstore::nfs_mount { 'scratch':
- project => $::labsproject,
- options => ['rw', 'soft', 'timeo=300', 'retrans=3'],
- mount_path => '/data/scratch',
- server => $nfs_server,
- share_path => '/scratch',
+ project => $::labsproject,
+ options => ['rw', 'soft', 'timeo=300', 'retrans=3'],
+ mount_path => '/data/scratch',
+ server => $nfs_server,
+ share_path => '/scratch',
+ lookupcache => $lookupcache,
}
labstore::nfs_mount { 'dumps':
- project => $::labsproject,
- options => ['ro', 'soft', 'timeo=300', 'retrans=3'],
- mount_path => '/public/dumps',
- share_path => '/dumps',
- server => $misc_nfs,
+ project => $::labsproject,
+ options => ['ro', 'soft', 'timeo=300', 'retrans=3'],
+ mount_path => '/public/dumps',
+ share_path => '/dumps',
+ server => $misc_nfs,
+ lookupcache => $lookupcache,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/298021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9458334ff21f5646ff1ade2f5885e16966f6bad4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
