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>
ceph · Jul 31, 2013 · 9b2c4fa · 9b2c4fa
1 parent 3b3816d
commit 9b2c4fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/s3tests.py b/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/swift.py b/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',