X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/017ea8c747b3bd9cb57c5a7d52ca90e423c5c1fc..60e2d19a092f4b15d4d2484405c46cbd84914616:/lib/controller/fed_containers.go

diff --git a/lib/controller/fed_containers.go b/lib/controller/fed_containers.go
index 7b8cdabe55..7fd5b25ad2 100644
--- a/lib/controller/fed_containers.go
+++ b/lib/controller/fed_containers.go
@@ -99,8 +99,14 @@ func remoteContainerRequestCreate(
 			containerRequest["runtime_token"] = newtok.TokenV2()
 		} else {
 			// Remote user. Container request will use the
-			// current token.
-			containerRequest["runtime_token"] = creds.Tokens[0]
+			// current token, minus the trailing portion
+			// (optional container uuid).
+			sp := strings.Split(creds.Tokens[0], "/")
+			if len(sp) >= 3 {
+				containerRequest["runtime_token"] = strings.Join(sp[0:3], "/")
+			} else {
+				containerRequest["runtime_token"] = creds.Tokens[0]
+			}
 		}
 	}