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 <josh.durgin@inktank.com>

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index ce34c344d7d87dc20ac4d868daa4cf2d1b044b3e..46a258afe28d197d3f8464b2cfa328f1f488137d 100644 (file)
--- 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 9aa5379b52bdf9c5303793fb953d817ee5c7b3b1..100d5ef388948de2f45a9042fa3014ed9eb004be 100644 (file)
--- 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 f8086d51b6c778510b79fa155967cf2505fff712..4d2c40912f3852e139475a6a871a6df06e21a199 100644 (file)
--- 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 98bb22d3f7dc2301cee4e7e5ea834ad935a082e1..4c287a900a1f82f82e2c318091c84a5659b7bf9b 100644 (file)
--- 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',