From: Daniel Pivonka <dpivonka@redhat.com>
Date: Fri, 5 Nov 2021 17:54:36 +0000 (-0400)
Subject: cephadm: fix upgrade name already in use
X-Git-Tag: v17.1.0~475^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43825%2Fhead;p=ceph.git

cephadm: fix upgrade name already in use

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/schedule.py b/src/pybind/mgr/cephadm/schedule.py
index 5004ca0fb0219..9ee0a5e3c970f 100644
--- 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