15467: Fix config.default.yml for SbatchEnvironmentVariables

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 051d478877637620aceb4cb41035825de3288208..9ac4aeeb9606461dd23f0f743e6a17a065662c76 100644 (file)
--- 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 3d4c252528046b9e281d272bb5264e7b4d06d0be..12581ddff08123cb3026afa0d7ecf5f510311570 100644 (file)
--- 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 4e7790603a94c8397835efa1569ca4fd5f23c2a7..602f30e1dae5480bb22ed39e3b0a9bf8c1e04e8f 100644 (file)
--- 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