From: Yuan Zhou <yuan.zhou@intel.com>
Date: Mon, 13 Jul 2015 03:07:41 +0000 (+0800)
Subject: rgw: Make vstart.sh print out swift user info
X-Git-Tag: v9.0.3~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea012fde23a8c6bf14210634af2e8743ea75eb2c;p=ceph.git

rgw: Make vstart.sh print out swift user info

Currently vstart.sh only print out S3 user info. This patch updates it
to print swift user info too. Also changes the swift account/user/password
to test/tester/testing which align with openstack-swift better:
https://github.com/openstack/swift/blob/master/etc/proxy-server.conf-sample#L270

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 4bf6a455ab98..c039eb733649 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -671,11 +671,18 @@ do_rgw()
 
     # Create Swift user
     echo "setting up user tester"
-    $CEPH_BIN/radosgw-admin user create --subuser=tester:testing --display-name=Tester-Subuser --key-type=swift --secret=asdf > /dev/null
+    $CEPH_BIN/radosgw-admin user create --subuser=test:tester --display-name=Tester-Subuser --key-type=swift --secret=testing > /dev/null
 
     echo ""
-    echo "  access key  $akey"
-    echo "  secret key  $skey"
+    echo "S3 User Info:"
+    echo "  access key:  $akey"
+    echo "  secret key:  $skey"
+    echo ""
+    echo "Swift User Info:"
+    echo "  account   : test"
+    echo "  user      : tester"
+    echo "  password  : testing"
+    echo ""
 }
 if [ "$start_rgw" -eq 1 ]; then
     do_rgw