From f4930e0b8327e5dcd6aafaac7cd51c1933b95456 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 8 Sep 2017 11:46:34 -0400 Subject: [PATCH] ceph-volume lvm.api all vg tags should match, not just one Signed-off-by: Alfredo Deza (cherry picked from commit 6d679855aa077e2de3f20316625d478a3697c78f) --- src/ceph-volume/ceph_volume/devices/lvm/api.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/api.py b/src/ceph-volume/ceph_volume/devices/lvm/api.py index b68f4bc4dfd5..27510339fb29 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/api.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/api.py @@ -284,13 +284,10 @@ class VolumeGroups(list): # actual filtered list if any filters were applied if vg_tags: tag_filtered = [] - for k, v in vg_tags.items(): - for volume in filtered: - if volume.tags.get(k) == str(v): - if volume not in tag_filtered: - tag_filtered.append(volume) - # return the tag_filtered volumes here, the `filtered` list is no - # longer useable + for volume in filtered: + matches = all(volume.tags.get(k) == str(v) for k, v in vg_tags.items()) + if matches: + tag_filtered.append(volume) return tag_filtered return filtered -- 2.47.3