From: Patrick Seidensal <pseidensal@suse.com>
Date: Wed, 6 Nov 2019 10:42:52 +0000 (+0100)
Subject: mgr/dashboard: return FQDN for default server_addr
X-Git-Tag: v14.2.5~87^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d9ba311d31a85eb68e1f726d19520c6e0782c635;p=ceph.git

mgr/dashboard: return FQDN for default server_addr

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

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 41e2070c246dd..95b3c6f8c9032 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -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
         )