From: Sage Weil <sage@newdream.net>
Date: Fri, 4 Jun 2021 02:04:32 +0000 (-0400)
Subject: Merge PR #41636 into master
X-Git-Tag: v17.1.0~1755
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce033d629ce61542de8eeaf4111a441c7ab3e251;p=ceph.git

Merge PR #41636 into master

* 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>
---

ce033d629ce61542de8eeaf4111a441c7ab3e251