X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dbbb649c9b797da8f6805af3a7e74e57b075d294..f5bba33140f89648ef07098e582b022e1ea1f9f9:/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 300e923640..e4a1e4840b 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -132,17 +132,10 @@ func (disp *Dispatcher) configure(prog string, args []string) error {
 		if disp.Client.Insecure {
 			os.Setenv("ARVADOS_API_HOST_INSECURE", "1")
 		}
-		ks := ""
-		if length(disp.cluster.Containers.SLURM.KeepServices) > 0 {
-			for _, svc := range disp.cluster.Containers.SLURM.KeepServices {
-				for k, _ := range svc.InternalURLs {
-					ks += k
-					ks += " "
-				}
-			}
-		}
-		os.Setenv("ARVADOS_KEEP_SERVICES", ks)
 		os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")
+		for k, v := range disp.cluster.Containers.SLURM.SbatchEnvironmentVariables {
+			os.Setenv(k, v)
+		}
 	} else {
 		disp.logger.Warnf("Client credentials missing from config, so falling back on environment variables (deprecated).")
 	}