RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check

Browse Source 
Fixes: https://tracker.ceph.com/issues/50401

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2021-04-16 12:49:59 -04:00
parent 3a7c72a9ed
commit 5bdf50e531
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pybind/mgr/cephadm/module.py
View File

@ -2283,17 +2283,20 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
'target_version': image_info.ceph_version,
'needs_update': dict(),
'up_to_date': list(),
'non_ceph_image_daemons': list()
}
for host, dm in self.cache.daemons.items():
for name, dd in dm.items():
if image_info.image_id == dd.container_image_id:
r['up_to_date'].append(dd.name())
else:
elif dd.daemon_type in (CEPH_TYPES + GATEWAY_TYPES):
r['needs_update'][dd.name()] = {
'current_name': dd.container_image_name,
'current_id': dd.container_image_id,
'current_version': dd.version,
}
else:
r['non_ceph_image_daemons'].append(dd.name())
if self.use_repo_digest and image_info.repo_digests:
# FIXME: we assume the first digest is the best one to use
r['target_digest'] = image_info.repo_digests[0]