qa/tasks/ceph: don't hard-code cluster name when copying fsid

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index df9860bfc720d582d9bffa6725a461e55ed90980..23e01f23b9ed8498811f1feba187cef9a9c026ad 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1111,7 +1111,8 @@ def run_daemon(ctx, config, type_):
             _, _, id_ = teuthology.split_role(role)
 
             if type_ == 'osd':
-                datadir='/var/lib/ceph/osd/ceph-' + id_
+                datadir='/var/lib/ceph/osd/{cluster}-{id}'.format(
+                    cluster=cluster_name, id=id_)
                 osd_uuid = teuthology.get_file(
                     remote=remote,
                     path=datadir + '/fsid',