From ee33dc8e53fb41b8ee23783a969ac5288d3211eb Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 11 May 2018 21:06:51 +0800 Subject: [PATCH] qa/workunits/ceph-disk: --no-mon-config port a095ec8b to the qa/workunits Signed-off-by: Kefu Chai --- qa/workunits/ceph-disk/ceph-disk-no-lockbox | 7 +++++++ 1 file changed, 7 insertions(+) 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, ], -- 2.47.3