ceph-volume: set journal_uuid and journal_device when using a partition

This correctly sets the tags when a partition is used for a filestore
journal.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index f1612503a97d582390d92c089714c6cd66422009..2529be9a2c2bf99f7918461651f16fe149999508 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -120,9 +120,13 @@ class Prepare(object):
             tags['ceph.%s_uuid' % device_type] = uuid
             tags['ceph.%s_device' % device_type] = path
             lv.set_tags(tags)
-            return path, uuid, tags
-        # otherwise assume this is a regular disk partition
-        return device_name, self.get_ptuuid(device_name), tags
+        else:
+            # otherwise assume this is a regular disk partition
+            uuid = self.get_ptuuid(device_name)
+            path = device_name
+            tags['ceph.%s_uuid' % device_type] = uuid
+            tags['ceph.%s_device' % device_type] = path
+        return path, uuid, tags
 
     @decorators.needs_root
     def prepare(self, args):