cephadm: fix upgrade name already in use

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit eece84dada04b99ea5debc694e0bb3452bf94093)

diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py
index 5004ca0fb0219230e909b974aa228e5e696074c0..9ee0a5e3c970f4e48bc148f3015a88c510107a7a 100644 (file)
--- a/src/pybind/mgr/cephadm/schedule.py
+++ b/src/pybind/mgr/cephadm/schedule.py
@@ -104,9 +104,9 @@ class DaemonPlacement(NamedTuple):
         if self.name and self.name != dd.daemon_id:
             return False
         if self.ports:
-            if self.ports != dd.ports:
+            if self.ports != dd.ports and dd.ports:
                 return False
-            if self.ip != dd.ip:
+            if self.ip != dd.ip and dd.ip:
                 return False
         return True