pybind/mgr/mgr_module: use get("mgr_ips") for standby get_mgr_ip()

This is necessary to allow the standby mgr to bind to the right IP.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d159adc20e005dc7f7a7cea06c2ee7aa6f06d559)

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index dd558ec61eecf1b4bb5b8454443bea7b81dd4dd0..f44a776e186968fa9a87ef4b16a461de2151e8ef 100644 (file)
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -799,8 +799,10 @@ class MgrStandbyModule(ceph_module.BaseMgrStandbyModule, MgrModuleLoggingMixin):
         return self._ceph_get(data_name)
 
     def get_mgr_ip(self) -> str:
-        # we don't have get() for standby modules; make do with the hostname
-        return socket.gethostname()
+        ips = self.get("mgr_ips").get('ips', [])
+        if not ips:
+            return socket.gethostname()
+        return ips[0]
 
     def get_localized_module_option(self, key: str, default: OptionValue = None) -> OptionValue:
         r = self._ceph_get_module_option(key, self.get_mgr_id())