mgr/orchestrator: allow deploying raw mode OSDs with --all-available-devices

Fixes: https://tracker.ceph.com/issues/58714
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c034b08d952467a99be35a8cf6fc02834eb9a933)

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 607cd4fad79c601e45f4a894d30fbfaaa66df99f..fcda16d1dd3ae9084a94d2f723732e02fe9ec2b0 100644 (file)
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -888,6 +888,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
                    unmanaged: Optional[bool] = None,
                    dry_run: bool = False,
                    no_overwrite: bool = False,
+                   method: Optional[OSDMethod] = None,
                    inbuf: Optional[str] = None  # deprecated. Was deprecated before Quincy
                    ) -> HandleCommandResult:
         """
@@ -930,7 +931,8 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
                     placement=PlacementSpec(host_pattern='*'),
                     data_devices=DeviceSelection(all=True),
                     unmanaged=unmanaged,
-                    preview_only=dry_run
+                    preview_only=dry_run,
+                    method=method
                 )
             ]
             return self._apply_misc(dg_specs, dry_run, format, no_overwrite)

diff --git a/src/python-common/ceph/deployment/drive_group.py b/src/python-common/ceph/deployment/drive_group.py
index 3141fd760e5363540ec5dc14a176d9060374095a..e8ee85885f67792ac20e028b7650498448db007c 100644 (file)
--- a/src/python-common/ceph/deployment/drive_group.py
+++ b/src/python-common/ceph/deployment/drive_group.py
@@ -15,6 +15,9 @@ class OSDMethod(str, enum.Enum):
     raw = 'raw'
     lvm = 'lvm'
 
+    def to_json(self) -> str:
+        return self.value
+
 
 class DeviceSelection(object):
     """