Merge pull request #49555 from fmount/drive_group_crush

Add per OSD crush_device_class definition

Reviewed-by: Adam King <adking@redhat.com>

diff --cc doc/cephadm/services/osd.rst
Simple merge

diff --cc src/python-common/ceph/deployment/drive_group.py
index 81e66b48ead49f1647b1bcb328b1113abfc6808e,bbd25b480561b7ce358ba093e08d27a756172234..3141fd760e5363540ec5dc14a176d9060374095a
--- 1/src/python-common/ceph/deployment/drive_group.py
--- 2/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,