]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: include service_name is generated DaemonDescription
authorSage Weil <sage@newdream.net>
Fri, 23 Apr 2021 19:13:05 +0000 (15:13 -0400)
committerSage Weil <sage@newdream.net>
Thu, 3 Jun 2021 12:36:57 +0000 (07:36 -0500)
commit466a158f4033837706d724a8796edf290b96b377
tree59a04f30af00c04bcc92b8c1f08c0d9738efa240
parent4510f2849ada04c76a54bd1abe59d9e300b495e4
mgr/cephadm: include service_name is generated DaemonDescription

This makes 'orch ls' match up daemosn to services (and probably cleans up
other bits and pieces) when the old daemon id -> service name calc code
can't do its thing.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 11ff4842a207c82dd4ec8254aa370962cde24c82)
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/tests/test_cephadm.py