From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Feb 2018 17:20:40 +0000 (-0600)
Subject: ceph-disk: --no-mon-config
X-Git-Tag: v13.0.2~78^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a095ec8b0fc0b787a0253b076c193b3bd83fc725;p=ceph.git

ceph-disk: --no-mon-config

Some of these cases make sense to fetch mon configs, but we are deprecating
ceph-disk anyway, and the tests currently make use of ceph-disk in places
that do not have a mon_host defined via a ceph.conf or other environment.
This avoids breaking those test cases without any real impact on users
(which will either use ceph-volume or presumably remain in a legacy config
environment).

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

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index f46e43976b05..e9c1a5148065 100644
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -1239,6 +1239,7 @@ def get_conf_with_default(cluster, variable):
         out = _check_output(
             args=[
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster={cluster}'.format(
                     cluster=cluster,
                 ),
@@ -1544,6 +1545,7 @@ def check_journal_reqs(args):
     log_file = "/var/log/ceph/$cluster-osd-check.log"
     _, _, allows_journal = command([
         'ceph-osd', '--check-allows-journal',
+        '--no-mon-config',
         '-i', '0',
         '--log-file', log_file,
         '--cluster', args.cluster,
@@ -1552,6 +1554,7 @@ def check_journal_reqs(args):
     ])
     _, _, wants_journal = command([
         'ceph-osd', '--check-wants-journal',
+        '--no-mon-config',
         '-i', '0',
         '--log-file', log_file,
         '--cluster', args.cluster,
@@ -1560,6 +1563,7 @@ def check_journal_reqs(args):
     ])
     _, _, needs_journal = command([
         'ceph-osd', '--check-needs-journal',
+        '--no-mon-config',
         '-i', '0',
         '--log-file', log_file,
         '--cluster', args.cluster,
@@ -3172,6 +3176,7 @@ def mkfs(
         command_check_call(
             [
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster', cluster,
                 '--mkfs',
                 '-i', osd_id,
@@ -3186,6 +3191,7 @@ def mkfs(
         command_check_call(
             [
                 'ceph-osd',
+                '--no-mon-config',
                 '--cluster', cluster,
                 '--mkfs',
                 '-i', osd_id,
@@ -4133,6 +4139,7 @@ def get_space_osd_uuid(name, path):
         out = _check_output(
             args=[
                 'ceph-osd',
+                '--no-mon-config',
                 '--get-device-fsid',
                 path,
             ],