From: Kefu Chai <kchai@redhat.com>
Date: Fri, 11 May 2018 13:06:51 +0000 (+0800)
Subject: qa/workunits/ceph-disk: --no-mon-config
X-Git-Tag: v14.0.0~150^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21942%2Fhead;p=ceph.git

qa/workunits/ceph-disk: --no-mon-config

port a095ec8b to the qa/workunits

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk-no-lockbox b/qa/workunits/ceph-disk/ceph-disk-no-lockbox
index b9c1c6c39da0..72af9a5f4de4 100755
--- a/qa/workunits/ceph-disk/ceph-disk-no-lockbox
+++ b/qa/workunits/ceph-disk/ceph-disk-no-lockbox
@@ -1039,6 +1039,7 @@ def get_conf_with_default(cluster, variable):
         out = _check_output(
             args=[
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster={cluster}'.format(
                     cluster=cluster,
                 ),
@@ -1327,16 +1328,19 @@ def get_free_partition_index(dev):
 def check_journal_reqs(args):
     _, _, allows_journal = command([
         'ceph-osd', '--check-allows-journal',
+        '--no-mon-config',
         '-i', '0',
         '--cluster', args.cluster,
     ])
     _, _, wants_journal = command([
         'ceph-osd', '--check-wants-journal',
+        '--no-mon-config',
         '-i', '0',
         '--cluster', args.cluster,
     ])
     _, _, needs_journal = command([
         'ceph-osd', '--check-needs-journal',
+        '--no-mon-config',
         '-i', '0',
         '--cluster', args.cluster,
     ])
@@ -2462,6 +2466,7 @@ def mkfs(
         command_check_call(
             [
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster', cluster,
                 '--mkfs',
                 '--mkkey',
@@ -2478,6 +2483,7 @@ def mkfs(
         command_check_call(
             [
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster', cluster,
                 '--mkfs',
                 '--mkkey',
@@ -3361,6 +3367,7 @@ def get_space_osd_uuid(name, path):
         out = _check_output(
             args=[
                 'ceph-osd',
+                '--no-mon-config',
                 '--get-device-fsid',
                 path,
             ],