From f53363ea4642dd165decc6786b835979a1dc9f73 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 23 Dec 2020 16:19:39 -0500 Subject: [PATCH] 17224: Provide alternate credentials to use for creating user tokens Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- services/login-sync/bin/arvados-login-sync | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/login-sync/bin/arvados-login-sync b/services/login-sync/bin/arvados-login-sync index 8162e22a2f..a9bff05464 100755 --- a/services/login-sync/bin/arvados-login-sync +++ b/services/login-sync/bin/arvados-login-sync @@ -31,6 +31,9 @@ keys = '' begin arv = Arvados.new({ :suppress_ssl_warnings => false }) + logincluster_arv = Arvados.new({ :api_host => (ENV['LOGINCLUSTER_ARVADOS_API_HOST'] || ENV['ARVADOS_API_HOST']), + :api_token => (ENV['LOGINCLUSTER_ARVADOS_API_TOKEN'] || ENV['ARVADOS_API_TOKEN']), + :suppress_ssl_warnings => false }) vm_uuid = ENV['ARVADOS_VIRTUAL_MACHINE_UUID'] @@ -190,7 +193,7 @@ begin begin if !File.exist?(tokenfile) - user_token = arv.api_client_authorization.create(api_client_authorization: {owner_uuid: l[:user_uuid], api_client_id: 0}) + user_token = logincluster_arv.api_client_authorization.create(api_client_authorization: {owner_uuid: l[:user_uuid], api_client_id: 0}) f = File.new(tokenfile, 'w') f.write("ARVADOS_API_HOST=#{ENV['ARVADOS_API_HOST']}\n") f.write("ARVADOS_API_TOKEN=v2/#{user_token[:uuid]}/#{user_token[:api_token]}\n") -- 2.30.2