From f026a1c9f661fc1442048ef0bfadf84c35c14254 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 28 Jan 2020 15:41:02 +0000 Subject: [PATCH] qa/tasks/cephadm: pass short dev name to osd prepare Zap needs a full path, but create/prepare needs the VG/LV only if it is an existing LV. We'll make c-v more friendly later. Signed-off-by: Sage Weil --- qa/tasks/cephadm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index aa3244fa3fb..7e198b47397 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -576,13 +576,14 @@ def ceph_osds(ctx, config): devs = devs_by_remote[remote] assert devs ## FIXME ## dev = devs.pop() + short_dev = dev.replace('/dev/', '') log.info('Deploying %s on %s with %s...' % ( osd, remote.shortname, dev)) _shell(ctx, cluster_name, remote, [ 'ceph-volume', 'lvm', 'zap', dev]) _shell(ctx, cluster_name, remote, [ 'ceph', 'orchestrator', 'osd', 'create', - remote.shortname + ':' + dev + remote.shortname + ':' + short_dev ]) ctx.daemons.register_daemon( remote, 'osd', id_,