Ryan Lane has submitted this change and it was merged.
Change subject: Labs: make autofs forcibly use nfs4 for labsnfs
......................................................................
Labs: make autofs forcibly use nfs4 for labsnfs
Ubundu Lucid (of which there remains some instances) doesn't
automatically select nfs4 rather than nfs3 according to mount
options; this makes the version explicit for /home and
/data/project when using labsnfs.
Change-Id: Idf8aed52f6ef2d975fd98e7b623521f970ac05cc
---
M templates/labsnfs/auto.space.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/labsnfs/auto.space.erb b/templates/labsnfs/auto.space.erb
index 331043e..f689809 100644
--- a/templates/labsnfs/auto.space.erb
+++ b/templates/labsnfs/auto.space.erb
@@ -1,6 +1,6 @@
-/home / -rw <%= nfscluster %>:/<%= instanceproject %>/home \
+/home / -fstype=nfs4,rw <%= nfscluster %>:/<%= instanceproject %>/home \
/.snapshot -fstype=autofs,ghost file:/etc/auto.time.home
-/data /project -rw <%= nfscluster %>:/<%= instanceproject %>/project \
+/data /project -fstype=nfs4,rw <%= nfscluster %>:/<%= instanceproject
%>/project \
/project/.snapshot -fstype=autofs,ghost file:/etc/auto.time.project
/public /keys -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/keys \
/datasets -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/publicdata-project
--
To view, visit https://gerrit.wikimedia.org/r/72936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf8aed52f6ef2d975fd98e7b623521f970ac05cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
