From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Fri, 7 Sep 2018 15:12:54 +0000 (+0200)
Subject: vstart: set admin socket for RGW in conf
X-Git-Tag: v14.0.1~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23983%2Fhead;p=ceph.git

vstart: set admin socket for RGW in conf

Currently ceph daemon cannot find rgw socket as client section sets the admin
socket to the tmp dir. whereas we actually write the socket in the out/
directory. Add this to ceph.conf, so that ceph daemon commands can find the
socket, avoiding the need for explicit path via --admin-daemon. When multiple
RGWs are created ceph daemon will only find the first configured RGW (as we are
only configuring one RGW per ceph.conf) and the others will have to be
explicitly passed via --admin-daemon or so.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 6cfd2478278..8a57d1e20f4 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -525,6 +525,7 @@ EOF
 $extra_conf
 [client.rgw]
         rgw frontends = $rgw_frontend port=$CEPH_RGW_PORT
+        admin socket = ${CEPH_OUT_DIR}/radosgw.${CEPH_RGW_PORT}.asok
         ; needed for s3tests
         rgw crypt s3 kms encryption keys = testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
         rgw crypt require ssl = false