From 5e94a9852c84926ccd3705fccf6f12f5e3a6d736 Mon Sep 17 00:00:00 2001 From: Pritha Srivastava Date: Fri, 2 Jun 2017 14:33:03 +0530 Subject: [PATCH] rgw: Changes for s3test config file, to add user under a tenant. Signed-off-by: Pritha Srivastava --- qa/tasks/s3tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 2f09f97df5ab4..ee16381d1b491 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -46,11 +46,12 @@ def download(ctx, config): else: log.info("Using branch '%s' for s3tests", branch) sha1 = cconf.get('sha1') + git_remote = cconf.get('git_remote', None) or teuth_config.ceph_git_base_url ctx.cluster.only(client).run( args=[ 'git', 'clone', '-b', branch, - teuth_config.ceph_git_base_url + 's3-tests.git', + git_remote + 's3-tests.git', '{tdir}/s3-tests'.format(tdir=testdir), ], ) @@ -97,7 +98,7 @@ def create_users(ctx, config): assert isinstance(config, dict) log.info('Creating rgw users...') testdir = teuthology.get_testdir(ctx) - users = {'s3 main': 'foo', 's3 alt': 'bar'} + users = {'s3 main': 'foo', 's3 alt': 'bar', 's3 tenant': 'testx$tenanteduser'} for client in config['clients']: s3tests_conf = config['s3tests_conf'][client] s3tests_conf.setdefault('fixtures', {}) @@ -364,6 +365,7 @@ def task(ctx, config): 'fixtures' : {}, 's3 main' : {}, 's3 alt' : {}, + 's3 tenant': {}, } ) -- 2.39.5