Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Fixup start-nfs for new storage layout
......................................................................
labstore: Fixup start-nfs for new storage layout
- sync-exports isn't needed, the nfs-exports daemon takes
care of that
- Uses new endpoints for tools, maps and others mounts
- Make sure that nfs-exports-daemon isn't running at
startup - so that we don't export unmounted and empty
folders to instances
Bug: T106590
Change-Id: Ia290d09db491935137e977ad532a65a0e937651e
---
M modules/labstore/files/start-nfs
M modules/labstore/manifests/fileserver/exports.pp
2 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
coren: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/labstore/files/start-nfs b/modules/labstore/files/start-nfs
index 3bd06f7..7838f67 100755
--- a/modules/labstore/files/start-nfs
+++ b/modules/labstore/files/start-nfs
@@ -26,11 +26,11 @@
exit 1
fi
-/usr/sbin/service nfs-kernel-server stop
-/bin/mount /srv/project
+/bin/systemctl stop nfs-kernel-server
+/bin/mount /srv/project/tools
+/bin/mount /srv/project/maps
+/bin/mount /srv/others
/bin/mount /srv/scratch
-/bin/mount /srv/keys
-/usr/local/sbin/sync-exports
-/usr/sbin/service nfs-project-exports start
+/bin/systemctl start nfs-exports
/sbin/ip addr add dev eth0 10.64.37.10/24
-/usr/sbin/service nfs-kernel-server start
+/bin/systemctl start nfs-kernel-server
diff --git a/modules/labstore/manifests/fileserver/exports.pp
b/modules/labstore/manifests/fileserver/exports.pp
index 93f692a..fedba9c 100644
--- a/modules/labstore/manifests/fileserver/exports.pp
+++ b/modules/labstore/manifests/fileserver/exports.pp
@@ -58,15 +58,9 @@
notify => Service['nfs-exports'],
}
- # Terrible hack
- if $is_active {
- $service_ensure = 'present'
- } else {
- $service_ensure = 'absent'
- }
base::service_unit { 'nfs-exports':
- ensure => $service_ensure,
- systemd => true,
+ systemd => true,
+ declare_service => false,
}
if $is_active {
--
To view, visit https://gerrit.wikimedia.org/r/228179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia290d09db491935137e977ad532a65a0e937651e
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[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
