X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f04693da1811e670d4cbb981debeecf14d79137c..608a1591840dfbeac3d5580c505b50bfface5929:/lib/service/cmd.go

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index c410e53684..d5619b87b3 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -79,6 +79,14 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
 	}
 
+	if strings.HasSuffix(prog, "controller") {
+		// Some config-loader checks try to make API calls via
+		// controller. Those can't be expected to work if this
+		// process _is_ the controller: we haven't started an
+		// http server yet.
+		loader.SkipAPICalls = true
+	}
+
 	cfg, err := loader.Load()
 	if err != nil {
 		return 1