mirror of
https://github.com/ceph/ceph
synced 2025-01-20 18:21:57 +00:00
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.
This commit is contained in:
parent
780ebcdf1b
commit
1ccdcb9896
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user