From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Jun 2017 15:51:59 +0000 (-0400)
Subject: pybind/mgr/dashboard: remove default of 127.0.0.1
X-Git-Tag: v12.1.0~13^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=015bc3f5c59353e24a367ce3aba7fd62b6f44afc;p=ceph.git

pybind/mgr/dashboard: remove default of 127.0.0.1

i.e., disabled until explicitly enabled by an admin.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 175b68abd527..362faddad11d 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -732,8 +732,10 @@ class Module(MgrModule):
 
                 return dict(result)
 
-        server_addr = self.get_localized_config('server_addr') or '127.0.0.1'
+        server_addr = self.get_localized_config('server_addr')
         server_port = self.get_localized_config('server_port') or '7000'
+        if server_addr is None:
+            raise RuntimeError('no server_addr configured; try "ceph config-key put mgr/dashboard/server_addr <ip>"')
         log.info("server_addr: %s server_port: %s" % (server_addr, server_port))
         cherrypy.config.update({
             'server.socket_host': server_addr,