]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #41636 into master
authorSage Weil <sage@newdream.net>
Fri, 4 Jun 2021 02:04:32 +0000 (22:04 -0400)
committerSage Weil <sage@newdream.net>
Fri, 4 Jun 2021 02:04:32 +0000 (22:04 -0400)
* refs/pull/41636/head:
mgr/cephadm/inventory: do not try to resolve current mgr host
pybind/mgr/mgr_module: make get_mgr_ip() return mgr's IP from mgrmap
mgr/restful: use get_mgr_ip() instead of hostname

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge