From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 4 Sep 2014 10:25:05 +0000 (+0200)
Subject: test/mon/mkfs.sh: add check for default keyring
X-Git-Tag: v0.88~180^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=123c3fbbb77089ee15d0b8edd8ae3e291706a70f;p=ceph.git

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 <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/mon/mkfs.sh b/src/test/mon/mkfs.sh
index 5e96e8d68c6..c86eaf4126a 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