RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43825 from Daniel-Pivonka/cephadm_upgrade_name_already_inuse

Browse Source 
cephadm: fix upgrade name already in use

Reviewed-by: Adam King <adking@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-11-10 11:08:11 +01:00 committed by GitHub
commit e5a2080e66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pybind/mgr/cephadm/schedule.py
View File

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