From 65172a0938f8e5be18363e2ade23e88e5a78e6f3 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 26 Jul 2013 14:11:01 -0700 Subject: [PATCH] rgw: pass socket path directly to radosgw Only radosgw needs this option, and each one will be different, so remove it from the ceph.conf template. Signed-off-by: Josh Durgin --- teuthology/ceph.conf.template | 1 - teuthology/task/rgw.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template index e20310c387d59..f01e2b6249358 100644 --- a/teuthology/ceph.conf.template +++ b/teuthology/ceph.conf.template @@ -37,7 +37,6 @@ mds debug frag = true [client] - rgw socket path = {testdir}/apache/tmp/fastcgi_sock/rgw_sock rgw cache enabled = true rgw enable ops log = true rgw enable usage log = true diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py index 2a1ecd092fead..f4122fbd7ede6 100644 --- a/teuthology/task/rgw.py +++ b/teuthology/task/rgw.py @@ -101,7 +101,8 @@ def ship_config(ctx, config, role_endpoints): client=client), data="""#!/bin/sh ulimit -c unlimited -exec radosgw -f -n {client} +exec radosgw -f -n {client} --rgw-socket-path {tdir}/apache/tmp.{client}/fastcgi_sock/rgw_sock + """.format(tdir=testdir, client=client) ) remote.run( -- 2.39.5