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 <josh.durgin@inktank.com>

diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template
index e20310c387d59edf4c92afa32f48922445005096..f01e2b6249358facb3ff3a1b9db6ec03152ba91f 100644 (file)
--- 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 2a1ecd092fead120c32f1b97ab6a6d6aa0b5c289..f4122fbd7ede6470ed072d0f23bdac34a3ffa8ad 100644 (file)
--- 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(