Merge pull request #1208 from lmlg/fs-key-rotation-fix

Fix test for ceph-fs key rotation
2024-05-16 14:50:59 +02:00
parent 31a351338c 5541905935
commit 79bc345806
1 changed files with 5 additions and 2 deletions
@@ -1829,8 +1829,11 @@ class CephMonKeyRotationTests(test_utils.BaseCharmTest):
        return next(iter(ret))[0]

    def _get_fs_client(self, unit):
-        ret = self._get_all_keys(unit, lambda x: (x.startswith('mds.') and
-                                                  x != 'mds.ceph-fs'))
+        def _filter_fs(name):
+            return (name.startswith('mds.') and
+                    name not in ('mds.ceph-fs', 'mds.None'))
+
+        ret = self._get_all_keys(unit, _filter_fs)
        if not ret:
            return None
        return next(iter(ret))[0]