RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: fix removing offline hosts with ingress daemons

Browse Source 
We need to convert the daemon type to service type here
or we'll try to access the "haproxy" or "keepalived" index
of the cephadm_services dictionary, which doesn't have those
keys (but does have an "ingress" key)

Fixes: https://tracker.ceph.com/issues/58537

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2023-01-22 13:59:51 -05:00
parent 919b244e5c
commit d9624e0666
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/module.py
View File

@ -1571,8 +1571,8 @@ Then run the following:
self.log.info(f"removing: {d.name()}")
if d.daemon_type != 'osd':
self.cephadm_services[str(d.daemon_type)].pre_remove(d)
self.cephadm_services[str(d.daemon_type)].post_remove(d, is_failed_deploy=False)
self.cephadm_services[daemon_type_to_service(str(d.daemon_type))].pre_remove(d)
self.cephadm_services[daemon_type_to_service(str(d.daemon_type))].post_remove(d, is_failed_deploy=False)
else:
cmd_args = {
'prefix': 'osd purge-actual',