From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 18 Oct 2016 15:33:23 +0000 (+0200)
Subject: tests: ceph-disk: force debug monc = 0
X-Git-Tag: v10.2.4~43^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f400ff222e531feb00de3ebf1860a0d4bcca736e;p=ceph.git

tests: ceph-disk: force debug monc = 0

The sh function will collect both stderr and stdout and debug
will mess the json parsing.

Fixes: http://tracker.ceph.com/issues/17607

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 469a53a4adc335ea4ff8e34a958b12f0f222a6c1)
---

diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
index 5fedde4d3638..cdcfc8483ad9 100644
--- a/qa/workunits/ceph-disk/ceph-disk-test.py
+++ b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -227,6 +227,10 @@ class TestCephDisk(object):
             c.helper("install multipath-tools device-mapper-multipath")
         c.conf['global']['pid file'] = '/var/run/ceph/$cluster-$name.pid'
         #
+        # Avoid json parsing interference
+        #
+        c.conf['global']['debug monc'] = 0
+        #
         # objecstore
         #
         c.conf['global']['osd journal size'] = 100