From 2f2108b3c0575e7afe7e2095bd3d8179f958e1ad Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 31 Jul 2013 12:47:48 -0700 Subject: [PATCH] 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 --- teuthology/task/rgw.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py index 14ab8dc3d9b26..99d709d1244f5 100644 --- 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) ) -- 2.39.5