From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 31 Jul 2013 20:32:58 +0000 (-0700)
Subject: s3/swift tests: call radosgw-admin as the right client
X-Git-Tag: 1.1.0~2013
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f7127b2431fe66453884373c22d57b65df982bf;p=teuthology.git

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 ce34c344d..46a258afe 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 9aa5379b5..100d5ef38 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 f8086d51b..4d2c40912 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 98bb22d3f..4c287a900 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',