From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 7 Jul 2017 14:44:20 +0000 (-0400)
Subject: qa/tasks/ceph: don't hard-code cluster name when copying fsid
X-Git-Tag: v12.1.1~113^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a8967cde7664c03d2973b6e13f48a27c796aa44;p=ceph.git

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 df9860bfc72..23e01f23b9e 100644
--- 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',