]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: return FQDN for default server_addr
authorPatrick Seidensal <pseidensal@suse.com>
Wed, 6 Nov 2019 10:42:52 +0000 (11:42 +0100)
committerPatrick Seidensal <pseidensal@suse.com>
Wed, 6 Nov 2019 13:57:28 +0000 (14:57 +0100)
Instead of returning '0.0.0.0' the dashboard returns the FQDN of the
host, as it is the case for '::'.

Fixes: https://tracker.ceph.com/issues/42664
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
src/pybind/mgr/dashboard/module.py

index f24a6f7c3d48aeecdccb224ab1047a5a12b04bca..b9b68429e7d3f31d3d3f2ad28817bbb9454cf6f5 100644 (file)
@@ -179,7 +179,7 @@ class CherryPyConfig(object):
 
         uri = "{0}://{1}:{2}{3}/".format(
             'https' if ssl else 'http',
-            socket.getfqdn() if server_addr == "::" else server_addr,
+            socket.getfqdn() if server_addr in ['::', '0.0.0.0'] else server_addr,
             server_port,
             self.url_prefix
         )