From 26c7dab57ef7a6bd8377441bb1063a38e096002d Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 11 May 2016 12:08:17 -0700 Subject: [PATCH] tasks: fix {testdir}/data paths The multi-cluster branch updated these to have a '$cluster.' prefix Signed-off-by: Josh Durgin --- tasks/ceph_objectstore_tool.py | 2 +- tasks/cephfs/kernel_mount.py | 4 ++-- tasks/filestore_idempotent.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py index b72d98b748c5c..3dc49624c2cb6 100644 --- 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 b26f3c6637375..f9e9050aa3b3e 100644 --- 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 da3995eafcb06..4e2a228fc3b6b 100644 --- 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))) -- 2.39.5