]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: don't create osd['block.db'] by default 33626/head
authorJan Fajerski <jfajerski@suse.com>
Mon, 25 Feb 2019 11:55:42 +0000 (12:55 +0100)
committerJan Fajerski <jfajerski@suse.com>
Fri, 28 Feb 2020 17:05:05 +0000 (18:05 +0100)
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit f648ba1d9a1ef12fa8dc35101ef485726c002987)

src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py

index 9567aa7f9fe7789be5be297b3bae526563ca8476..099b1cc36b0861bae1fcb42c75b78b87189a8bd9 100644 (file)
@@ -264,7 +264,7 @@ class MixedType(MixedStrategy):
 
         for device in self.data_devs:
             for hdd in range(self.osds_per_device):
-                osd = {'data': {}, 'block.db': {}}
+                osd = {'data': {}}
                 osd['data']['path'] = device.abspath
                 osd['data']['size'] = device.lvm_size.b / self.osds_per_device
                 osd['data']['percentage'] = 100 / self.osds_per_device
@@ -273,6 +273,7 @@ class MixedType(MixedStrategy):
                 )
 
                 if self.db_or_journal_devs:
+                    osd['block.db'] = {}
                     osd['block.db']['path'] = 'vg: %s' % vg_name
                     osd['block.db']['size'] = int(self.block_db_size.b)
                     osd['block.db']['human_readable_size'] = str(self.block_db_size)