From: Tom Clegg <tom@curoverse.com>
Date: Sat, 8 Oct 2016 22:25:54 +0000 (-0400)
Subject: 10041: Set ARVADOS_KEEP_SERVICES from Client.KeepServicesURIs field.
X-Git-Tag: 1.1.0~681^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/62a5bae0cf096fee69add487cd28a8bdbd4fa17c?hp=25236212b8f726335ede5d4aa5da120b81ef19a4

10041: Set ARVADOS_KEEP_SERVICES from Client.KeepServicesURIs field.
---

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 85a71d4774..aaea51cbf7 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -32,8 +32,6 @@ type Config struct {
 	//
 	// Example: []string{"crunch-run", "--cgroup-parent-subsystem=memory"}
 	CrunchRunCommand []string
-
-	ArvadosKeepServices []string
 }
 
 func main() {
@@ -85,7 +83,7 @@ func doMain() error {
 		if theConfig.Client.Insecure {
 			os.Setenv("ARVADOS_API_INSECURE", "1")
 		}
-		os.Setenv("ARVADOS_KEEP_SERVICES", strings.Join(theConfig.ArvadosKeepServices, " "))
+		os.Setenv("ARVADOS_KEEP_SERVICES", strings.Join(theConfig.Client.KeepServiceURIs, " "))
 		os.Setenv("ARVADOS_EXTERNAL_CLIENT", "")
 	} else {
 		log.Printf("warning: Client credentials missing from config, so falling back on environment variables (deprecated).")
diff --git a/services/crunch-dispatch-slurm/usage.go b/services/crunch-dispatch-slurm/usage.go
index cd2d8ad23d..ddfbdb0926 100644
--- a/services/crunch-dispatch-slurm/usage.go
+++ b/services/crunch-dispatch-slurm/usage.go
@@ -12,9 +12,9 @@ var exampleConfigFile = []byte(`
 	    "APIHost": "zzzzz.arvadosapi.com",
 	    "AuthToken": "xyzzy",
 	    "Insecure": false
+	    "KeepServiceURIs": [],
 	},
 	"CrunchRunCommand": ["crunch-run"],
-	"ArvadosKeepServices": [""],
 	"PollPeriod": "10s",
 	"SbatchArguments": ["--partition=foo", "--exclude=node13"]
     }`)