From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 24 Jul 2017 19:07:17 +0000 (-0400)
Subject: rgw: restore admin socket path in mrgw.sh
X-Git-Tag: v12.1.2~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16540%2Fhead;p=ceph.git

rgw: restore admin socket path in mrgw.sh

ceph-conf was rejecting the entity name with:

error parsing 'radosgw.8000': expected string of the form TYPE.ID, valid
types are: auth, mon, osd, mds, mgr, client

these mstart/mrun/mrgw scripts carefully place their output files under
their respective run/<cluster-name>/out subdirectory to keep them from
clashing

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/mrgw.sh b/src/mrgw.sh
index 92791780b3bc..c5770ca917f2 100755
--- a/src/mrgw.sh
+++ b/src/mrgw.sh
@@ -22,7 +22,7 @@ shift 2
 
 run_root=$script_root/run/$name
 pidfile=$run_root/out/radosgw.${port}.pid
-asokfile=$($ceph_bin/ceph-conf --show-config-value admin_socket --name radosgw.${port})
+asokfile=$run_root/out/radosgw.${port}.asok
 logfile=$run_root/out/radosgw.${port}.log
 
 $vstart_path/mstop.sh $name radosgw $port