projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update token in keepproxy test.
[arvados.git]
/
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 9f69c44460caf7e03733acf619817f31e3a72327..e4a1e4840b41cbf0385ec38fa12fcde44fd1b853 100644
(file)
--- a/
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@
-132,8
+132,10
@@
func (disp *Dispatcher) configure(prog string, args []string) error {
if disp.Client.Insecure {
os.Setenv("ARVADOS_API_HOST_INSECURE", "1")
}
if disp.Client.Insecure {
os.Setenv("ARVADOS_API_HOST_INSECURE", "1")
}
- os.Setenv("ARVADOS_KEEP_SERVICES", strings.Join(disp.Client.KeepServiceURIs, " "))
os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")
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).")
}
} else {
disp.logger.Warnf("Client credentials missing from config, so falling back on environment variables (deprecated).")
}