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 b840a0f445532435def7b200b1878ce824559c1b..530feccd05e7a0caf2089604813a62e025543087 100644 (file)
--- 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 82a385282026bffa1ba3c61c3dbc41dd8921f47b..059805ed8a8a5efa2403cf0d6f9188b9dfdfd3df 100644 (file)
--- 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 = {}