From: Jeff Layton Date: Thu, 21 Feb 2019 22:00:15 +0000 (-0500) Subject: mgr/orchestrator: add new list of directories to DriveGroupSpec X-Git-Tag: v14.1.1~116^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d8f95a27f82f4a93aea5c2e09278306ae5e77c8;p=ceph-ci.git 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 --- diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py index abfd321b089..3959d6a0c9e 100644 --- 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