From 1600533b3a8c5655a2a75c9c869d07494bd5f026 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Thu, 10 Nov 2016 13:58:35 -0500 Subject: [PATCH] swift: added "--cluster" to rgw-admin command for multisite support Signed-off-by: Ali Maredia --- teuthology/task/swift.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py index b5e417a39..f6a0972d7 100644 --- a/teuthology/task/swift.py +++ b/teuthology/task/swift.py @@ -71,6 +71,7 @@ def create_users(ctx, config): testdir = teuthology.get_testdir(ctx) users = {'': 'foo', '2': 'bar'} for client in config['clients']: + cluster_name, daemon_type, client_id = teuthology.split_role(client) testswift_conf = config['testswift_conf'][client] for suffix, user in users.iteritems(): _config_user(testswift_conf, '{user}.{client}'.format(user=user, client=client), user, suffix) @@ -81,6 +82,7 @@ def create_users(ctx, config): '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', '-n', client, + '--cluster', cluster_name, 'user', 'create', '--subuser', '{account}:{user}'.format(account=testswift_conf['func_test']['account{s}'.format(s=suffix)],user=user), '--display-name', testswift_conf['func_test']['display_name{s}'.format(s=suffix)], @@ -96,6 +98,7 @@ def create_users(ctx, config): for client in config['clients']: for user in users.itervalues(): uid = '{user}.{client}'.format(user=user, client=client) + cluster_name, daemon_type, client_id = teuthology.split_role(client) ctx.cluster.only(client).run( args=[ 'adjust-ulimits', @@ -103,6 +106,7 @@ def create_users(ctx, config): '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', '-n', client, + '--cluster', cluster_name, 'user', 'rm', '--uid', uid, '--purge-data', -- 2.47.3