From 85a5abee202ff8e5fa21334aeaba15d6a4e31c10 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 16 Dec 2019 18:52:43 +0100
Subject: [MountVmStore] Add support for dnbd3 with no NFS fallback

Don't enable the /srv/openslx/nfs export on the server if internal
storage is being used, but NFS fallback is disabled.
---
 scripts/mount-store                                           | 4 ++++
 src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/scripts/mount-store b/scripts/mount-store
index b19ec83..3c25e27 100755
--- a/scripts/mount-store
+++ b/scripts/mount-store
@@ -68,6 +68,10 @@ storage_test () {
 }
 
 enable_nfs_export () {
+	if [ -n "$TM_NOLOCALNFS" ]; then
+		disable_nfs_export
+		return
+	fi
 	# Enable nfs server
 	systemctl enable nfs-kernel-server.service
 	# Enable our export
diff --git a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
index 11c15db..e0a998a 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java
@@ -22,6 +22,8 @@ public class MountVmStore extends SystemCommandTask
 	private String username = null;
 	@Expose
 	private String password = null;
+	@Expose
+	private boolean localNfs = true;
 
 	private Output status = new Output();
 	
@@ -65,6 +67,7 @@ public class MountVmStore extends SystemCommandTask
 	{
 		environment.put( "TM_USERNAME", this.username );
 		environment.put( "TM_PASSWORD", this.password );
+		environment.put( "TM_NOLOCALNFS", this.localNfs ? "" : "1" );
 		if ( !Util.isEmpty( this.opts ) ) {
 			environment.put( "TM_MOUNT_OPTIONS", this.opts );
 		}
-- 
cgit v1.2.3-55-g7522