From: Sage Weil <sage@inktank.com>
Date: Sun, 17 Feb 2013 03:37:17 +0000 (-0800)
Subject: rgw: specify keyring location
X-Git-Tag: 1.1.0~2312^2~21
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=45ddbe636ec709eb35f7e0d6d601f73e51846dd0;p=teuthology.git

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 2814b4f987..95f391bf9e 100644
--- 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),