From: Georgios Kyratsas <gkyratsas@suse.com>
Date: Wed, 13 May 2020 11:29:35 +0000 (+0200)
Subject: qa/tasks/cephadm: Add support for raw disks
X-Git-Tag: v15.2.4~73^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe5e32d9f766c9806637ef84d4eef562bf682001;p=ceph.git

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 <gkyratsas@suse.com>
(cherry picked from commit 35e158605ef557671e8feec691fd245b17ea6189)
---

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 9db60ffa2d89..01fe4e800e7a 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, [