Merge pull request #84 from kreczko/fix-empty-mount-under-scratch

Remove MOUNT_UNDER_SCRATCH if no folders are defined
HEP-Puppet · Dec 13, 2017 · 19dbc1d · 19dbc1d
2 parents 2f84648 + 10409df
commit 19dbc1d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/templates/20_workernode.config.erb b/templates/20_workernode.config.erb
@@ -88,9 +88,11 @@ STARTER_JOB_ENVIRONMENT = "<%= @starter_job_environment.map{|e| e.join('=')}.joi
 ## Location of scratch directories
 EXECUTE = <%= @pool_home %>/condor
 
-## Writable scratch directories bind mounted in scratch, e.g. for docker / singularity containers. 
+<% if @mount_under_scratch_dirs.any? -%>
+## Writable scratch directories bind mounted in scratch, e.g. for docker / singularity containers.
 ## Auto-deleted after the job exits.
 MOUNT_UNDER_SCRATCH = <%= @mount_under_scratch_dirs.flatten.join(", ") %>
+<% end -%>
 
 ## Make sure jobs have independent PID namespaces
 <% if @use_pid_namespaces -%>