From 323ac1a72d3e57a9858c9ef3cd2faab83e7c7c89 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Thu, 30 Dec 2010 10:34:11 -0800
Subject: [PATCH] qa: rbd: disable automatic keyring discovery

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
---
 qa/rbd/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/rbd/common.sh b/qa/rbd/common.sh
index 606e39a49b9..ce63f2520bc 100644
--- a/qa/rbd/common.sh
+++ b/qa/rbd/common.sh
@@ -33,7 +33,7 @@ set_variables() {
 
     [ -z "$imgsize" ] && imgsize=1024
     [ -z "$user" ] && user=admin
-    [ -z "$keyring" ] && keyring="`$CCONF keyring`"
+    #[ -z "$keyring" ] && keyring="`$CCONF keyring`"
     [ -z "$secret" ] && secret="`cauthtool $keyring -n client.$user -p`"
 
     monip="`echo $monhost | sed 's/:/ /g' | awk '{print $1}'`"