From: Joshua Schmid Date: Tue, 7 Jul 2020 08:33:51 +0000 (+0200) Subject: mgr/cephadm: do not accept filestore osds in osdspecs X-Git-Tag: v15.2.5~105^2~33 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1502c8cbb45c3ce7b08c55fcc9fffe27fd599026;p=ceph.git mgr/cephadm: do not accept filestore osds in osdspecs Signed-off-by: Joshua Schmid (cherry picked from commit 4974a2c1b8e67426db12b7bb2ea3d1af892ca16e) --- diff --git a/src/python-common/ceph/deployment/drive_group.py b/src/python-common/ceph/deployment/drive_group.py index 40d0cae7605f..2386dca2bad8 100644 --- a/src/python-common/ceph/deployment/drive_group.py +++ b/src/python-common/ceph/deployment/drive_group.py @@ -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')