]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: mrgw.sh uses instance name 'client.rgw' 18404/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 19 Oct 2017 17:21:39 +0000 (13:21 -0400)
committerCasey Bodley <cbodley@redhat.com>
Thu, 19 Oct 2017 17:21:41 +0000 (13:21 -0400)
in vstart.sh, rgw config was moved into the [client.rgw] section, which
vstart always uses as the radosgw instance name. this broke the
multisite tests in test/rgw/test_multi.py because they use mrgw.sh to
start the gateways instead

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/mrgw.sh

index c699396b660f8646091c951505975c6ffba86b88..0525f19addc5cb609c5c20610de51d201696adae 100755 (executable)
@@ -27,4 +27,4 @@ logfile=$run_root/out/radosgw.${port}.log
 
 $vstart_path/mstop.sh $name radosgw $port
 
-$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile
+$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" -n client.rgw --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile