rgw: specify keyring location

Otherwise we look at the default /var/lib/ceph/radosgw/ceph-$id/keyring.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 2814b4f98737139520cf490112b53db0403ac8e2..95f391bf9eaa626bac908a5afa1c69715020ea9d 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -118,6 +118,8 @@ def start_rgw(ctx, config):
             ]
         run_cmd_tail=[
                 'radosgw',
+                # authenticate as client.admin and use system keyring
+                '-k', '/etc/ceph/ceph.keyring',
                 '--log-file', '{tdir}/archive/log/rgw.log'.format(tdir=testdir),
                 '--rgw_ops_log_socket_path', '{tdir}/rgw.opslog.sock'.format(tdir=testdir),
                 '{tdir}/apache/apache.conf'.format(tdir=testdir),