From: Luis Pabón <lpabon@redhat.com>
Date: Wed, 8 Oct 2014 05:04:07 +0000 (-0400)
Subject: Update vstart to setup users for s3-tests
X-Git-Tag: v0.88~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2712%2Fhead;p=ceph.git

Update vstart to setup users for s3-tests

vstart.sh now creates the users for the default configuration
for the s3-tests, available on https://github.com/ceph/s3-tests.

Also updated the documentation to show the correct RadosGW port.

Signed-off-by: Luis Pabón <lpabon@redhat.com>
---

diff --git a/doc/dev/quick_guide.rst b/doc/dev/quick_guide.rst
index c696074f04ce..481ef726dd5f 100644
--- a/doc/dev/quick_guide.rst
+++ b/doc/dev/quick_guide.rst
@@ -108,9 +108,9 @@ You can now use the swift python client to communicate with the RadosGW.
 
 .. code::
 
-    $ swift -A http://localhost:8080/auth -U tester:testing -K asdf list
-    $ swift -A http://localhost:8080/auth -U tester:testing -K asdf upload mycontainer ceph
-    $ swift -A http://localhost:8080/auth -U tester:testing -K asdf list
+    $ swift -A http://localhost:8000/auth -U tester:testing -K asdf list
+    $ swift -A http://localhost:8000/auth -U tester:testing -K asdf upload mycontainer ceph
+    $ swift -A http://localhost:8000/auth -U tester:testing -K asdf list
 
 
 Run unit tests
diff --git a/src/vstart.sh b/src/vstart.sh
index febfa560fbdf..82509c472e94 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -625,6 +625,22 @@ do_rgw()
     echo "setting up user testid"
     $CEPH_BIN/radosgw-admin user create --uid testid --access-key $akey --secret $skey --display-name 'M. Tester' --email tester@ceph.com -c $conf_fn > /dev/null
 
+    # Create S3-test users
+    # See: https://github.com/ceph/s3-tests
+    echo "setting up s3-test users"
+    $CEPH_BIN/radosgw-admin user create \
+        --uid 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef \
+        --access-key ABCDEFGHIJKLMNOPQRST \
+        --secret abcdefghijklmnopqrstuvwxyzabcdefghijklmn \
+        --display-name youruseridhere \
+        --email s3@example.com -c $conf_fn > /dev/null
+    $CEPH_BIN/radosgw-admin user create \
+        --uid 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234 \
+        --access-key NOPQRSTUVWXYZABCDEFG \
+        --secret nopqrstuvwxyzabcdefghijklmnabcdefghijklm \
+        --display-name john.doe \
+        --email john.doe@example.com -c $conf_fn > /dev/null
+
     # 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