From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Nov 2019 14:44:41 +0000 (-0600)
Subject: mgr/ssh: populate labels
X-Git-Tag: v15.1.0~742^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d2b1bfa3050128745ceb81e7d4646aaae4428b5;p=ceph.git

mgr/ssh: populate labels

Signed-off-by: Sage Weil <sage@redhat.com>
---

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):