From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 6 Aug 2018 15:58:31 +0000 (-0400)
Subject: ceph-volume lvm.batch allow extra flags for bluestore
X-Git-Tag: v14.0.1~658^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4149d664fa51eb7b2f900370c2bd000b1a5b1edc;p=ceph.git

ceph-volume lvm.batch allow extra flags for bluestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
index bb3d6be4fe320..03fd92f653668 100644
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
@@ -124,11 +124,16 @@ class SingleType(object):
             lvs = lvm.create_lvs(create['vg'], parts=create['parts'], name_prefix='osd-data')
             vg_name = create['vg'].name
             for lv in lvs:
-                # FIXME: no support for dmcrypt, crush class, etc...
-                Create([
-                    '--bluestore',
-                    '--data', "%s/%s" % (vg_name, lv.name),
-                ]).main()
+                command = ['--bluestore', '--data']
+                command.append('%s/%s' % (vg_name, lv.name))
+                if self.args.dmcrypt:
+                    command.append('--dmcrypt')
+                if self.args.no_systemd:
+                    command.append('--no-systemd')
+                if self.args.crush_device_class:
+                    command.extend(['--crush-device-class', self.args.crush_device_class])
+
+                Create(command).main()
 
 
 class MixedType(object):
@@ -232,12 +237,19 @@ class MixedType(object):
             from uuid import uuid4
             data_lv = lvm.create_lv('osd-data-%s' % str(uuid4()), vg.name)
             db_lv = db_lvs.pop()
-            # FIXME: no support for dmcrypt, crush class, etc...
-            Create([
+            command = [
                 '--bluestore',
                 '--data', "%s/%s" % (data_lv.vg_name, data_lv.name),
                 '--block.db', '%s/%s' % (db_lv.vg_name, db_lv.name)
-            ]).main()
+            ]
+            if self.args.dmcrypt:
+                command.append('--dmcrypt')
+            if self.args.no_systemd:
+                command.append('--no-systemd')
+            if self.args.crush_device_class:
+                command.extend(['--crush-device-class', self.args.crush_device_class])
+
+            Create(command).main()
 
     def validate(self):
         """