]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: try to get FQDN for inventory address 45621/head
authorTatjana Dehler <tdehler@suse.com>
Wed, 9 Mar 2022 15:23:49 +0000 (16:23 +0100)
committerTatjana Dehler <tdehler@suse.com>
Thu, 24 Mar 2022 13:39:17 +0000 (14:39 +0100)
commit4095f939e54f028d216a4c7f22f51ed35993f2fb
treee00bdecfa806a9fef0712fd64d975ba8497f0ad3
parenta53f4798f3e096fd048e845ad785157158b29e59
mgr/cephadm: try to get FQDN for inventory address

Fixes: https://tracker.ceph.com/issues/54502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 4f14993b1667fff309cd9cd6f9dad638a5a7e502)

Conflicts:
src/pybind/mgr/cephadm/services/cephadmservice.py
Fixed conflict because `get_keyring_with_caps` has not been
backported to octopus: https://github.com/ceph/ceph/pull/39677
src/pybind/mgr/cephadm/services/monitoring.py
Fixed a few conflicts because the master contains some improvements
around handling URLs, e.g. https://github.com/ceph/ceph/pull/43579
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/services/monitoring.py