From 123c3fbbb77089ee15d0b8edd8ae3e291706a70f Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Thu, 4 Sep 2014 12:25:05 +0200 Subject: [PATCH] test/mon/mkfs.sh: add check for default keyring The auth_cephx_key check always fails if there is a default keyring in /etc/ceph/ available. Check if keyring exists and fail with error message if keyring file in path. Signed-off-by: Danny Al-Gaaf --- src/test/mon/mkfs.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/mon/mkfs.sh b/src/test/mon/mkfs.sh index 5e96e8d68c694..c86eaf4126a1c 100755 --- a/src/test/mon/mkfs.sh +++ b/src/test/mon/mkfs.sh @@ -112,6 +112,11 @@ EOF } function auth_cephx_key() { + if [ -f /etc/ceph/keyring ] ; then + echo "Please move /etc/ceph/keyring away for testing!" + return 1 + fi + local key=$(./ceph-authtool --gen-print-key) if mon_mkfs --key='corrupted key' ; then -- 2.39.5