From 1f7127b2431fe66453884373c22d57b65df982bf Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 31 Jul 2013 13:32:58 -0700 Subject: [PATCH] s3/swift tests: call radosgw-admin as the right client This allows the right region and zone info to be read from ceph.conf Signed-off-by: Josh Durgin --- teuthology/task/s3readwrite.py | 2 ++ teuthology/task/s3roundtrip.py | 2 ++ teuthology/task/s3tests.py | 2 ++ teuthology/task/swift.py | 2 ++ 4 files changed, 8 insertions(+) diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py index ce34c344d7d87..46a258afe28d1 100644 --- a/teuthology/task/s3readwrite.py +++ b/teuthology/task/s3readwrite.py @@ -75,6 +75,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'create', '--uid', s3tests_conf[section]['user_id'], '--display-name', s3tests_conf[section]['display_name'], @@ -95,6 +96,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'rm', '--uid', uid, '--purge-data', diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py index 9aa5379b52bdf..100d5ef388948 100644 --- a/teuthology/task/s3roundtrip.py +++ b/teuthology/task/s3roundtrip.py @@ -75,6 +75,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'create', '--uid', s3tests_conf[section]['user_id'], '--display-name', s3tests_conf[section]['display_name'], @@ -95,6 +96,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'rm', '--uid', uid, '--purge-data', diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py index f8086d51b6c77..4d2c40912f385 100644 --- a/teuthology/task/s3tests.py +++ b/teuthology/task/s3tests.py @@ -82,6 +82,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'create', '--uid', s3tests_conf[section]['user_id'], '--display-name', s3tests_conf[section]['display_name'], @@ -102,6 +103,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'rm', '--uid', uid, '--purge-data', diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py index 98bb22d3f7dc2..4c287a900a1f8 100644 --- a/teuthology/task/swift.py +++ b/teuthology/task/swift.py @@ -63,6 +63,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, '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)], @@ -83,6 +84,7 @@ def create_users(ctx, config): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'radosgw-admin', + '-n', client, 'user', 'rm', '--uid', uid, '--purge-data', -- 2.39.5