From 247006e2b7e3e3e1860b093d2a8d23d4536255d3 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 2 Aug 2019 15:19:23 -0400 Subject: [PATCH] 15467: Fix config.default.yml for SbatchEnvironmentVariables Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/config/config.default.yml | 5 ++--- lib/config/deprecated.go | 2 +- lib/config/generated_config.go | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index 051d478877..9ac4aeeb96 100644 --- a/lib/config/config.default.yml +++ b/lib/config/config.default.yml @@ -525,9 +525,8 @@ Clusters: SLURM: PrioritySpread: 0 SbatchArgumentsList: [] - KeepServices: - SAMPLE: - InternalURLs: {} + SbatchEnvironmentVariables: + SAMPLE: "" Managed: # Path to dns server configuration directory # (e.g. /etc/unbound.d/conf.d). If false, do not write any config diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index 3d4c252528..12581ddff0 100644 --- a/lib/config/deprecated.go +++ b/lib/config/deprecated.go @@ -204,7 +204,7 @@ func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) { } ks += u } - disp.cluster.Containers.SLURM.SbatchEnvironmentVariables = map[string]string{"ARVADOS_KEEP_SERVICES": ks} + cluster.Containers.SLURM.SbatchEnvironmentVariables = map[string]string{"ARVADOS_KEEP_SERVICES": ks} } // update config using values from an crunch-dispatch-slurm config file. diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go index 4e7790603a..602f30e1da 100644 --- a/lib/config/generated_config.go +++ b/lib/config/generated_config.go @@ -531,9 +531,8 @@ Clusters: SLURM: PrioritySpread: 0 SbatchArgumentsList: [] - KeepServices: - SAMPLE: - InternalURLs: {} + SbatchEnvironmentVariables: + SAMPLE: "" Managed: # Path to dns server configuration directory # (e.g. /etc/unbound.d/conf.d). If false, do not write any config -- 2.30.2