From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 23:59:11 +0000 (+0000)
Subject: qa/tasks/ceph2: pass ceph-daemon path to DaemonState
X-Git-Tag: v15.1.0~790^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd94d53cbcf8d6c124bf87e30e46b0a4e0ddefeb;p=ceph.git

qa/tasks/ceph2: pass ceph-daemon path to DaemonState

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

diff --git a/qa/tasks/ceph2.conf b/qa/tasks/ceph2.conf
index b840a0f4455..530feccd05e 100644
--- a/qa/tasks/ceph2.conf
+++ b/qa/tasks/ceph2.conf
@@ -1,4 +1,8 @@
 [global]
+# make logging friendly to teuthology
+log_to_file = true
+log_to_stderr = false
+
 mon clock drift allowed = 1.000
 
 # replicate across OSDs, not hosts
diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py
index 82a38528202..059805ed8a8 100644
--- a/qa/tasks/ceph2.py
+++ b/qa/tasks/ceph2.py
@@ -641,7 +641,8 @@ def task(ctx, config):
     first_ceph_cluster = False
     if not hasattr(ctx, 'daemons'):
         first_ceph_cluster = True
-        ctx.daemons = DaemonGroup(use_ceph_daemon=True)
+        ctx.daemons = DaemonGroup(
+            use_ceph_daemon='{}/ceph-daemon'.format(testdir))
     if not hasattr(ctx, 'ceph'):
         ctx.ceph = {}
         ctx.managers = {}