qa: --no-mon-config for ceph-objectstore-tool --op mkfs ..

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/standalone/osd/osd-dup.sh b/qa/standalone/osd/osd-dup.sh
index f4b25be23456be7f72000f39355e1559764deb95..9675d917fa2f8ad0bfd8a0987efb660a990220ec 100755 (executable)
--- a/qa/standalone/osd/osd-dup.sh
+++ b/qa/standalone/osd/osd-dup.sh
@@ -56,7 +56,7 @@ function TEST_filestore_to_bluestore() {
     O=$CEPH_ARGS
     CEPH_ARGS+="--log-file $dir/cot.log --log-max-recent 0 "
     ceph-objectstore-tool --type bluestore --data-path $dir/0 --fsid $ofsid \
-                         --op mkfs || return 1
+                         --op mkfs --no-mon-config || return 1
     ceph-objectstore-tool --data-path $dir/0.old --target-data-path $dir/0 \
                          --op dup || return 1
     CEPH_ARGS=$O

diff --git a/qa/workunits/cephtool/test_kvstore_tool.sh b/qa/workunits/cephtool/test_kvstore_tool.sh
index 39b63988584eb007d1afd667ca1fe209efeddec5..293e7aa0fbadc512797a15b4461caf8074841a76 100755 (executable)
--- a/qa/workunits/cephtool/test_kvstore_tool.sh
+++ b/qa/workunits/cephtool/test_kvstore_tool.sh
@@ -26,7 +26,7 @@ TEMP_FILE=$(mktemp $TEMP_DIR/test_invalid.XXX)
 function test_ceph_kvstore_tool()
 {
   # create a data directory
-  ceph-objectstore-tool --data-path ${TEMP_DIR} --op mkfs 
+  ceph-objectstore-tool --data-path ${TEMP_DIR} --op mkfs --no-mon-config
 
   # list
   origin_kv_nums=`ceph-kvstore-tool  bluestore-kv ${TEMP_DIR} list 2>/dev/null | wc -l`