From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Tue, 9 Aug 2011 23:25:00 +0000 (-0700)
Subject: Make rbd task use mnt.N not mnt.client.N as mountpoint.
X-Git-Tag: 1.1.0~2859
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1ccdcb9896715f89d0b85ef84577c6355d43cf18;p=teuthology.git

Make rbd task use mnt.N not mnt.client.N as mountpoint.

Everything else expects this, so e.g. workunits wouldn't work with rbd.
---

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index 220cfce3f9..87af757724 100644
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -284,12 +284,19 @@ def mount(ctx, config):
     else:
         role_images = [(role, None) for role in config]
 
-    mnt_template = '/tmp/cephtest/mnt.{role}'
+    def strip_client_prefix(role):
+        PREFIX = 'client.'
+        assert role.startswith(PREFIX)
+        id_ = role[len(PREFIX):]
+        return id_
+
+    mnt_template = '/tmp/cephtest/mnt.{id}'
     for role, image in role_images:
         if image is None:
             image = default_image_name(role)
         (remote,) = ctx.cluster.only(role).remotes.keys()
-        mnt = mnt_template.format(role=role)
+        id_ = strip_client_prefix(role)
+        mnt = mnt_template.format(id=id_)
         remote.run(
             args=[
                 'mkdir',
@@ -315,7 +322,8 @@ def mount(ctx, config):
             if image is None:
                 image = default_image_name(role)
             (remote,) = ctx.cluster.only(role).remotes.keys()
-            mnt = mnt_template.format(role=role)
+            id_ = strip_client_prefix(role)
+            mnt = mnt_template.format(id=id_)
             remote.run(
                 args=[
                     'sudo',