From: Andrew Schoen Date: Fri, 27 Oct 2017 16:29:50 +0000 (-0500) Subject: ceph-volume: set journal_uuid and journal_device when using a partition X-Git-Tag: v12.2.2~73^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a0016131b1ec900255057876c98fc70e00542f0;p=ceph.git 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 (cherry picked from commit 1a8561d38dd7363dc920ae82ec1343b2b75a1ca2) --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py index 6fd367202cd..b25f7ea9aa3 100644 --- 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):