diff options
author | Simon Rettberg | 2018-03-21 10:30:08 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-03-21 10:30:08 +0100 |
commit | 5bc04570f60ce8be5281ee445c690c9b847b7cb8 (patch) | |
tree | f3dea11aca086411c9ad3bd53fce270c581bc87c /src/main/java | |
parent | [CreateLdapConfig] Adapt to new config format (diff) | |
download | tmlite-bwlp-5bc04570f60ce8be5281ee445c690c9b847b7cb8.tar.gz tmlite-bwlp-5bc04570f60ce8be5281ee445c690c9b847b7cb8.tar.xz tmlite-bwlp-5bc04570f60ce8be5281ee445c690c9b847b7cb8.zip |
[MountVmStore] Support passing custom mount options
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java index 034dab5..11c15db 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java +++ b/src/main/java/org/openslx/taskmanager/tasks/MountVmStore.java @@ -1,10 +1,13 @@ package org.openslx.taskmanager.tasks; +import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import org.openslx.satserver.util.Constants; +import org.openslx.satserver.util.Util; import org.openslx.taskmanager.api.SystemCommandTask; +import com.btr.proxy.util.Logger; import com.google.gson.annotations.Expose; public class MountVmStore extends SystemCommandTask @@ -14,6 +17,8 @@ public class MountVmStore extends SystemCommandTask @Expose private String type = null; @Expose + private String opts = null; + @Expose private String username = null; @Expose private String password = null; @@ -52,10 +57,18 @@ public class MountVmStore extends SystemCommandTask Constants.BASEDIR + "/scripts/mount-store", "images", this.address, - this.username, - this.password }; } + + @Override + protected void initEnvironment( Map<String, String> environment ) + { + environment.put( "TM_USERNAME", this.username ); + environment.put( "TM_PASSWORD", this.password ); + if ( !Util.isEmpty( this.opts ) ) { + environment.put( "TM_MOUNT_OPTIONS", this.opts ); + } + } @Override protected boolean processEnded( int exitCode ) |