From: Adam King <47704447+adk3798@users.noreply.github.com> Date: Mon, 13 Feb 2023 15:09:07 +0000 (-0500) Subject: Merge pull request #49555 from fmount/drive_group_crush X-Git-Tag: v18.1.0~392 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45813ea2f3de4ee1f9fccb2b3031a30cd48ca7a7;p=ceph.git Merge pull request #49555 from fmount/drive_group_crush Add per OSD crush_device_class definition Reviewed-by: Adam King --- 45813ea2f3de4ee1f9fccb2b3031a30cd48ca7a7 diff --cc src/python-common/ceph/deployment/drive_group.py index 81e66b48ead4,bbd25b480561..3141fd760e53 --- a/src/python-common/ceph/deployment/drive_group.py +++ b/src/python-common/ceph/deployment/drive_group.py @@@ -179,12 -188,11 +188,12 @@@ class DriveGroupSpec(ServiceSpec) filter_logic='AND', # type: str preview_only=False, # type: bool extra_container_args=None, # type: Optional[List[str]] + extra_entrypoint_args: Optional[List[str]] = None, data_allocate_fraction=None, # type: Optional[float] method=None, # type: Optional[OSDMethod] - crush_device_class=None, # type: Optional[str] config=None, # type: Optional[Dict[str, str]] custom_configs=None, # type: Optional[List[CustomConfig]] + crush_device_class=None, # type: Optional[str] ): assert service_type is None or service_type == 'osd' super(DriveGroupSpec, self).__init__('osd', service_id=service_id,