tasks: fix {testdir}/data paths

The multi-cluster branch updated these to have a '$cluster.' prefix

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py
index b72d98b748c5c9b6ba57d855123278e0d9a67cff..3dc49624c2cb6f9e6811fce158144fd2231c3a68 100644 (file)
--- a/tasks/ceph_objectstore_tool.py
+++ b/tasks/ceph_objectstore_tool.py
@@ -218,7 +218,7 @@ def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
     osds = ctx.cluster.only(teuthology.is_type('osd'))
 
     TEUTHDIR = teuthology.get_testdir(ctx)
-    DATADIR = os.path.join(TEUTHDIR, "data")
+    DATADIR = os.path.join(TEUTHDIR, "ceph.data")
     DATALINECOUNT = 10000
     ERRORS = 0
     NUM_OBJECTS = config.get('objects', 10)

diff --git a/tasks/cephfs/kernel_mount.py b/tasks/cephfs/kernel_mount.py
index b26f3c66373751cdcff4a253d61d169475c6c496..f9e9050aa3b3e75884ddfdb134b43d27c2aafb71 100644 (file)
--- a/tasks/cephfs/kernel_mount.py
+++ b/tasks/cephfs/kernel_mount.py
@@ -46,7 +46,7 @@ class KernelMount(CephFSMount):
             id=self.client_id, remote=self.client_remote, mnt=self.mountpoint))
 
         keyring = self.get_keyring_path()
-        secret = '{tdir}/data/client.{id}.secret'.format(tdir=self.test_dir, id=self.client_id)
+        secret = '{tdir}/ceph.data/client.{id}.secret'.format(tdir=self.test_dir, id=self.client_id)
         self.write_secret_file(self.client_remote, 'client.{id}'.format(id=self.client_id),
                                keyring, secret)
 
@@ -243,4 +243,4 @@ class KernelMount(CephFSMount):
         lines = mds_sessions.split("\n")
         epoch_barrier = int(lines[2].split()[1].strip('"'))
 
-        return epoch, epoch_barrier
\ No newline at end of file
+        return epoch, epoch_barrier

diff --git a/tasks/filestore_idempotent.py b/tasks/filestore_idempotent.py
index da3995eafcb0651f54b5d76c4988000cd017b5a3..4e2a228fc3b6b513bfaa546ef2bccc19ae47470e 100644 (file)
--- a/tasks/filestore_idempotent.py
+++ b/tasks/filestore_idempotent.py
@@ -36,7 +36,7 @@ def task(ctx, config):
 
     testdir = teuthology.get_testdir(ctx)
 
-    dir = '%s/data/test.%s' % (testdir, client)
+    dir = '%s/ceph.data/test.%s' % (testdir, client)
 
     seed = str(int(random.uniform(1,100)))