From 9c1e84ab1fdaad47cb0e27453b19de8c899a9700 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 29 Aug 2017 09:26:35 -0400 Subject: [PATCH] ceph-volume lvm.activate retrieve the journal uuid if journal is a device Signed-off-by: Alfredo Deza (cherry picked from commit a368fa1ad6d6265c5094eacbe7e72f642b43559d) --- src/ceph-volume/ceph_volume/devices/lvm/activate.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index 7787aabd18bfd..4fe5881ad67e1 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -18,7 +18,10 @@ def activate_filestore(lvs): # blow up with a KeyError if this doesn't exist osd_fsid = osd_lv.tags['ceph.osd_fsid'] if not osd_journal_lv: - osd_journal = osd_lv.tags.get('ceph.journal_device') + # must be a pv, by quering lvm by the uuid we are ensuring that the + # device path is always correct + osd_journal_pv = api.get_pv(pv_uuid=osd_lv.tags['journal_uuid']) + osd_journal = osd_journal_pv.pv_name else: osd_journal = osd_journal.lv_path -- 2.39.5