diff --git a/qa/tasks/mgr/test_dashboard.py b/qa/tasks/mgr/test_dashboard.py index b0cf200d61b..783c492d3f2 100644 --- a/qa/tasks/mgr/test_dashboard.py +++ b/qa/tasks/mgr/test_dashboard.py @@ -49,11 +49,18 @@ class TestDashboard(MgrTestCase): self.assertNotEqual(original_uri, failed_over_uri) # The original active daemon should have come back up as a standby - # and be doing redirects to the new active daemon + # and be doing redirects to the new active daemon. r = requests.get(original_uri, allow_redirects=False, verify=False) self.assertEqual(r.status_code, 303) self.assertEqual(r.headers['Location'], failed_over_uri) + # Ensure that every URL redirects to the active daemon. + r = requests.get("{}/runtime.js".format(original_uri), + allow_redirects=False, + verify=False) + self.assertEqual(r.status_code, 303) + self.assertEqual(r.headers['Location'], failed_over_uri) + def test_standby_disable_redirect(self): self.mgr_cluster.mon_manager.raw_cluster_cmd("config", "set", "mgr", "mgr/dashboard/standby_behaviour", diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py index b080d17b0ac..dcfa42fcaa9 100644 --- a/src/pybind/mgr/dashboard/module.py +++ b/src/pybind/mgr/dashboard/module.py @@ -473,7 +473,7 @@ class StandbyModule(MgrStandbyModule, CherryPyConfig): class Root(object): @cherrypy.expose - def index(self): + def default(self, *args, **kwargs): if module.get_module_option('standby_behaviour', 'redirect') == 'redirect': active_uri = module.get_active_uri() if active_uri: