]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix 'orch ps --refresh' 34190/head
authorSage Weil <sage@redhat.com>
Wed, 25 Mar 2020 15:39:59 +0000 (10:39 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:52:58 +0000 (20:52 -0500)
The use of host in the refresh loop was clobbering the argument value.

Fixes: https://tracker.ceph.com/issues/44513
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 764ce71bd202315fdf4403d9e1e8ae55ef849a90)

src/pybind/mgr/cephadm/module.py

index 2ebf9d29bfdcf122cbaedcb16cf83e120a09489c..d1b56ad0d5f961d88f3d73ad64276c8f2b4a763e 100644 (file)
@@ -1885,8 +1885,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             if host:
                 self._refresh_host_daemons(host)
             else:
-                for host, hi in self.inventory.items():
-                    self._refresh_host_daemons(host)
+                for hostname, hi in self.inventory.items():
+                    self._refresh_host_daemons(hostname)
         result = []
         for h, dm in self.cache.daemons.items():
             if host and h != host: