From b2f0b6f6d29cbe33bfe200e9fa709284677cd6b9 Mon Sep 17 00:00:00 2001 From: Paul Cuzner Date: Fri, 19 Feb 2021 12:37:36 +1300 Subject: [PATCH] mgr/cephadm:Remove check from ceph metadata gathering A check for _ceph_get_server was included for unit testing, but the tests have been updated to make this obsolete. Signed-off-by: Paul Cuzner --- src/pybind/mgr/cephadm/configchecks.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/pybind/mgr/cephadm/configchecks.py b/src/pybind/mgr/cephadm/configchecks.py index ce69e1a2016e..3294e634428d 100644 --- a/src/pybind/mgr/cephadm/configchecks.py +++ b/src/pybind/mgr/cephadm/configchecks.py @@ -339,16 +339,14 @@ class CephadmConfigChecks: """Build a map of service -> service metadata""" service_map: Dict[str, Optional[Dict[str, str]]] = {} - # If we have the mgr bindings in place, we can create a map - if hasattr(self.mgr, '_ceph_get_server'): - for server in self.mgr.list_servers(): - for service in server.get('services', []): - service_map.update( - { - f"{service['type']}.{service['id']}": - self.mgr.get_metadata(service['type'], service['id']) - } - ) + for server in self.mgr.list_servers(): + for service in server.get('services', []): + service_map.update( + { + f"{service['type']}.{service['id']}": + self.mgr.get_metadata(service['type'], service['id']) + } + ) return service_map def _check_kernel_lsm(self) -> None: -- 2.47.3