X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7db3857d78a099108c3204c25294a5aec1f3a3bc..dfeee281597cef5539f8c78bc249a6c9bfc19c18:/lib/controller/fed_containers.go

diff --git a/lib/controller/fed_containers.go b/lib/controller/fed_containers.go
index a923f757f2..c62cea1168 100644
--- a/lib/controller/fed_containers.go
+++ b/lib/controller/fed_containers.go
@@ -42,13 +42,11 @@ func remoteContainerRequestCreate(
 		return true
 	}
 
-	if *clusterId == "" {
-		*clusterId = h.handler.Cluster.ClusterID
-	}
-
-	if strings.HasPrefix(currentUser.Authorization.UUID, h.handler.Cluster.ClusterID) &&
-		*clusterId == h.handler.Cluster.ClusterID {
-		// local user submitting container request to local cluster
+	if *clusterId == "" || *clusterId == h.handler.Cluster.ClusterID {
+		// Submitting container request to local cluster. No
+		// need to set a runtime_token (rails api will create
+		// one when the container runs) or do a remote cluster
+		// request.
 		return false
 	}