From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 26 Jul 2013 21:11:01 +0000 (-0700)
Subject: rgw: pass socket path directly to radosgw
X-Git-Tag: 1.1.0~2038
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65172a0938f8e5be18363e2ade23e88e5a78e6f3;p=teuthology.git

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 e20310c38..f01e2b624 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 2a1ecd092..f4122fbd7 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(