]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: do not accept filestore osds in osdspecs
authorJoshua Schmid <jschmid@suse.de>
Tue, 7 Jul 2020 08:33:51 +0000 (10:33 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 13:17:10 +0000 (15:17 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4974a2c1b8e67426db12b7bb2ea3d1af892ca16e)

src/python-common/ceph/deployment/drive_group.py

index 40d0cae7605fa102e0d484e65b109f7a771e8f61..2386dca2bad81cbc6670a98a2de67a2488a83809 100644 (file)
@@ -293,8 +293,9 @@ class DriveGroupSpec(ServiceSpec):
             if s.all:
                 raise DriveGroupValidationError("`all` is only allowed for data_devices")
 
-        if self.objectstore not in ('filestore', 'bluestore'):
-            raise DriveGroupValidationError("objectstore not in ('filestore', 'bluestore')")
+        if self.objectstore not in ('bluestore'):
+            raise DriveGroupValidationError(f"{self.objectstore} is not supported. Must be "
+                                            f"one of ('bluestore')")
 
         if self.block_wal_size is not None and type(self.block_wal_size) != int:
             raise DriveGroupValidationError('block_wal_size must be of type int')