From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 2 Sep 2015 14:54:44 +0000 (-0400)
Subject: vstart: add -c argument to radosgw-admin commands
X-Git-Tag: v9.1.0~223^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d506bf14756826e3c7ebf102b57265c6da01a96a;p=ceph.git

vstart: add -c argument to radosgw-admin commands

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

diff --git a/src/vstart.sh b/src/vstart.sh
index 8edd8895a1e..679d33a1614 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -698,7 +698,7 @@ do_rgw()
 
     RGWSUDO=
     [ $CEPH_RGW_PORT -lt 1024 ] && RGWSUDO=sudo
-    $RGWSUDO $CEPH_BIN/radosgw --log-file=${CEPH_OUT_DIR}/rgw.log ${RGWDEBUG} --debug-ms=1
+    $RGWSUDO $CEPH_BIN/radosgw -c $conf_fn --log-file=${CEPH_OUT_DIR}/rgw.log ${RGWDEBUG} --debug-ms=1
 
     # Create S3 user
     local akey='0555b35654ad1656d804'
@@ -724,7 +724,7 @@ do_rgw()
 
     # Create Swift user
     echo "setting up user tester"
-    $CEPH_BIN/radosgw-admin user create --subuser=test:tester --display-name=Tester-Subuser --key-type=swift --secret=testing > /dev/null
+    $CEPH_BIN/radosgw-admin user create -c $conf_fn --subuser=test:tester --display-name=Tester-Subuser --key-type=swift --secret=testing > /dev/null
 
     echo ""
     echo "S3 User Info:"