import 15.2.5

[ceph.git] / ceph / src / python-common / ceph / deployment / drive_selection / selector.py

diff --git a/ceph/src/python-common/ceph/deployment/drive_selection/selector.py b/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
index cdc21caa52ff2a6d6622b6f79f9ead16bd023bee..921f125616c25fd925a16f74bc6fef6c22273001 100644 (file)
--- a/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
+++ b/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
@@ -134,11 +134,19 @@ class DriveSelection(object):
             if disk in devices:
                 continue
 
-            if not all(m.compare(disk) for m in FilterGenerator(device_filter)):
-                logger.debug(
-                    "Ignoring disk {}. Filter did not match".format(
-                        disk.path))
-                continue
+            if self.spec.filter_logic == 'AND':
+                if not all(m.compare(disk) for m in FilterGenerator(device_filter)):
+                    logger.debug(
+                        "Ignoring disk {}. Not all filter did match the disk".format(
+                            disk.path))
+                    continue
+
+            if self.spec.filter_logic == 'OR':
+                if not any(m.compare(disk) for m in FilterGenerator(device_filter)):
+                    logger.debug(
+                        "Ignoring disk {}. No filter matched the disk".format(
+                            disk.path))
+                    continue
 
             logger.debug('Adding disk {}'.format(disk.path))
             devices.append(disk)