From 2186477e997ca8ae5f044aa5199d98b8775b47b6 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 29 Aug 2025 10:51:38 -0400 Subject: [PATCH] qa/rgw: s3tests task configures account ids s3tests for s3control and iam apis need to know the account id Signed-off-by: Casey Bodley --- qa/tasks/s3tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 93d370251c1..27f486dc8ad 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -94,12 +94,13 @@ def download(ctx, config): ) -def _config_user(s3tests_conf, section, user, email): +def _config_user(s3tests_conf, section, user, email, account): """ Configure users for this section by stashing away keys, ids, and email addresses. """ s3tests_conf[section].setdefault('user_id', user) + s3tests_conf[section].setdefault('account_id', account) s3tests_conf[section].setdefault('email', email) s3tests_conf[section].setdefault('display_name', 'Mr.{user}'.format(user=user)) s3tests_conf[section].setdefault('access_key', @@ -156,9 +157,9 @@ def create_users(ctx, config, s3tests_conf): if section == 's3 tenant': args += ['--tenant', 'testx'] ctx.cluster.only(client).run(args=args) - _config_user(conf, section, account_id, account_email) + _config_user(conf, section, account_id, account_email, account_id) else: - _config_user(conf, section, user_id, user_email) + _config_user(conf, section, user_id, user_email, None) # for keystone users, read ec2 credentials into s3tests.conf instead # of creating a local user -- 2.39.5