mgr/orchestrator: add new list of directories to DriveGroupSpec

Add a new data_directories list to DriveGroupSpec that is intended to
hold a list of directories in which OSDs should be created, as opposed
to the raw devices in data_devices.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index abfd321b089b6e8bbb400f17c793e056c4efcb79..3959d6a0c9e8fd110f1805830ae20f5d6641a9b5 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -566,9 +566,9 @@ class DriveGroupSpec(object):
     understands.
     """
     def __init__(self, host_pattern, data_devices, db_devices=None, wal_devices=None, journal_devices=None,
-                 osds_per_device=None, objectstore='bluestore', encrypted=False, db_slots=None,
-                 wal_slots=None):
-        # type: (str, DeviceSelection, Optional[DeviceSelection], Optional[DeviceSelection], Optional[DeviceSelection], int, str, bool, int, int) -> ()
+                 data_directories=None, osds_per_device=None, objectstore='bluestore', encrypted=False,
+                 db_slots=None, wal_slots=None):
+        # type: (str, DeviceSelection, Optional[DeviceSelection], Optional[DeviceSelection], Optional[DeviceSelection], Optional[List[str]], int, str, bool, int, int) -> ()
 
         # concept of applying a drive group to a (set) of hosts is tightly
         # linked to the drive group itself
@@ -592,6 +592,9 @@ class DriveGroupSpec(object):
         #: To fully utilize nvme devices multiple osds are required.
         self.osds_per_device = osds_per_device
 
+        #: A list of strings, containing paths which should back OSDs
+        self.data_directories = data_directories
+
         #: ``filestore`` or ``bluestore``
         self.objectstore = objectstore