From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Mar 2020 15:39:59 +0000 (-0500)
Subject: mgr/cephadm: fix 'orch ps --refresh'
X-Git-Tag: v15.2.1~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=062bb4855e7feb2c236fd461d4b342815bb74671;p=ceph.git

mgr/cephadm: fix 'orch ps --refresh'

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2ebf9d29bfdc..d1b56ad0d5f9 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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: