From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Feb 2018 19:09:55 +0000 (-0600)
Subject: qa: --no-mon-config for ceph-objectstore-tool --op mkfs ..
X-Git-Tag: v13.0.2~78^2~17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e974800f63574f211eedc9b4b8a9158e2ef8f4;p=ceph.git

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 f4b25be23456b..9675d917fa2f8 100755
--- 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 39b63988584eb..293e7aa0fbadc 100755
--- 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`