From: Matt Benjamin <mbenjamin@redhat.com>
Date: Thu, 14 Jan 2021 19:15:46 +0000 (-0500)
Subject: test/rgw_file: override keyring if we gen keys
X-Git-Tag: v17.1.0~3178^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9bac99361fe318412f470010cdfdde725b1396ec;p=ceph.git

test/rgw_file: override keyring if we gen keys

Run with ceph.keyring not that of client.${CEPH_ID}.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/qa/workunits/rgw/test_librgw_file.sh b/qa/workunits/rgw/test_librgw_file.sh
index dd08befa4e39..1371ff711075 100755
--- a/qa/workunits/rgw/test_librgw_file.sh
+++ b/qa/workunits/rgw/test_librgw_file.sh
@@ -11,45 +11,49 @@ then
        --secret $AWS_SECRET_ACCESS_KEY \
        --display-name "librgw test user" \
        --email librgw@example.com || echo "librgw user exists"
+
+    # keyring override for teuthology env
+    KEYRING="/etc/ceph/ceph.keyring"
+    K="-k ${KEYRING}"
 fi
 
 # nfsns is the main suite
 
 # create herarchy, and then list it
 echo "phase 1.1"
-ceph_test_librgw_file_nfsns  --hier1 --dirs1 --create --rename --verbose
+ceph_test_librgw_file_nfsns ${K} --hier1 --dirs1 --create --rename --verbose
 
 # the older librgw_file can consume the namespace
 echo "phase 1.2"
-ceph_test_librgw_file_nfsns --getattr --verbose
+ceph_test_librgw_file_nfsns ${K} --getattr --verbose
 
 # and delete the hierarchy
 echo "phase 1.3"
-ceph_test_librgw_file_nfsns --hier1 --dirs1 --delete --verbose
+ceph_test_librgw_file_nfsns ${K} --hier1 --dirs1 --delete --verbose
 
 # bulk create/delete buckets
 echo "phase 2.1"
-ceph_test_librgw_file_cd --create --multi --verbose
+ceph_test_librgw_file_cd ${K} --create --multi --verbose
 echo "phase 2.2"
-ceph_test_librgw_file_cd --delete --multi --verbose
+ceph_test_librgw_file_cd ${K} --delete --multi --verbose
 
 # write continuation test
 echo "phase 3.1"
-ceph_test_librgw_file_aw --create --large --verify
+ceph_test_librgw_file_aw ${K} --create --large --verify
 echo "phase 3.2"
-ceph_test_librgw_file_aw --delete --large
+ceph_test_librgw_file_aw ${K} --delete --large
 
 # continued readdir
 echo "phase 4.1"
-ceph_test_librgw_file_marker --create --marker1 --marker2 --nobjs=100 --verbose
+ceph_test_librgw_file_marker ${K} --create --marker1 --marker2 --nobjs=100 --verbose
 echo "phase 4.2"
-ceph_test_librgw_file_marker --delete --verbose
+ceph_test_librgw_file_marker ${K} --delete --verbose
 
 # advanced i/o--but skip readv/writev for now--split delete from
 # create and stat ops to avoid fault in sysobject cache
 echo "phase 5.1"
-ceph_test_librgw_file_gp --get --stat --put --create
+ceph_test_librgw_file_gp ${K} --get --stat --put --create
 echo "phase 5.2"
-ceph_test_librgw_file_gp --delete
+ceph_test_librgw_file_gp ${K} --delete
 
 exit 0