rgw: fix dir creation and keyring

fastcgi_sock dir needs to exist before radosgw starts, and apache-execed radosgw needs an explicit keyring argument.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 14ab8dc3d9b26f587fd5b3600168d974ae925129..99d709d1244f53f3f945bc98f6fc8ec8ce95cc8d 100644 (file)
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -24,8 +24,8 @@ def create_dirs(ctx, config):
                 '-p',
                 '{tdir}/apache/htdocs.{client}'.format(tdir=testdir,
                                                        client=client),
-                '{tdir}/apache/tmp.{client}'.format(tdir=testdir,
-                                                    client=client),
+                '{tdir}/apache/tmp.{client}/fastcgi_sock'.format(tdir=testdir,
+                                                                 client=client),
                 run.Raw('&&'),
                 'mkdir',
                 '{tdir}/archive/apache.{client}'.format(tdir=testdir,
@@ -101,7 +101,7 @@ def ship_config(ctx, config, role_endpoints):
                                                                  client=client),
             data="""#!/bin/sh
 ulimit -c unlimited
-exec radosgw -f -n {client} --rgw-socket-path {tdir}/apache/tmp.{client}/fastcgi_sock/rgw_sock
+exec radosgw -f -n {client} -k /etc/ceph/ceph.{client}.keyring --rgw-socket-path {tdir}/apache/tmp.{client}/fastcgi_sock/rgw_sock
 
 """.format(tdir=testdir, client=client)
             )