From 1d2b1bfa3050128745ceb81e7d4646aaae4428b5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 25 Nov 2019 08:44:41 -0600 Subject: [PATCH] mgr/ssh: populate labels Signed-off-by: Sage Weil --- src/pybind/mgr/ssh/module.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py index f5e47bffc66..46805d7a656 100644 --- a/src/pybind/mgr/ssh/module.py +++ b/src/pybind/mgr/ssh/module.py @@ -572,11 +572,12 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): Notes: - skip async: manager reads from cache. - - TODO: - - InventoryNode probably needs to be able to report labels """ - nodes = [orchestrator.InventoryNode(host_name, inventory.Devices([])) for host_name in self.inventory_cache] + nodes = [ + orchestrator.InventoryNode(h, + inventory.Devices([]), + i.get('labels', [])) + for h, i in self.inventory.items()] return orchestrator.TrivialReadCompletion(nodes) def add_host_label(self, host, label): -- 2.47.3