ceph-volume lvm.activate retrieve the journal uuid if journal is a device

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a368fa1ad6d6265c5094eacbe7e72f642b43559d)

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 7787aabd18bfd741d0d8282a0d18df7d1486f0e9..4fe5881ad67e154471b73470517966b4ff22a378 100644 (file)
--- 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