]> git.apps.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)
committerLaura Paduano <lpaduano@suse.com>
Fri, 8 Nov 2019 09:19:15 +0000 (10:19 +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>
(cherry picked from commit a4e96b45ac19838ba6f883f413a7281bc92100c7)

src/pybind/mgr/dashboard/module.py

index 41e2070c246ddea11fd1c36ef9ed7c9e9e6bc4e0..95b3c6f8c9032b5734616803b3dde3c2169846ee 100644 (file)
@@ -242,7 +242,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
         )