From 35e158605ef557671e8feec691fd245b17ea6189 Mon Sep 17 00:00:00 2001 From: Georgios Kyratsas Date: Wed, 13 May 2020 13:29:35 +0200 Subject: [PATCH] qa/tasks/cephadm: Add support for raw disks Currently tests on raw disks are failing due to stripping '/dev/' from device name. (ie https://tracker.ceph.com/issues/45383#change-165721) Signed-off-by: Georgios Kyratsas --- qa/tasks/cephadm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 1d6247b35dd69..af542c4549076 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -595,7 +595,10 @@ def ceph_osds(ctx, config): devs = devs_by_remote[remote] assert devs ## FIXME ## dev = devs.pop() - short_dev = dev.replace('/dev/', '') + if all(_ in dev for _ in ('lv', 'vg')): + short_dev = dev.replace('/dev/', '') + else: + short_dev = dev log.info('Deploying %s on %s with %s...' % ( osd, remote.shortname, dev)) _shell(ctx, cluster_name, remote, [ -- 2.39.5