From: Patrick Nawracay <pnawracay@suse.com>
Date: Wed, 10 Jul 2019 10:48:46 +0000 (+0000)
Subject: mgr/dashboard: controllers/grafana is not Python3 compatible
X-Git-Tag: v15.1.0~2218^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e0b8ff2133495806e75eedb07658f442b400994;p=ceph-ci.git

mgr/dashboard: controllers/grafana is not Python3 compatible

Fixes: http://tracker.ceph.com/issues/40428

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/controllers/grafana.py b/src/pybind/mgr/dashboard/controllers/grafana.py
index bb3e3a1e4a4..0d4331ff246 100644
--- a/src/pybind/mgr/dashboard/controllers/grafana.py
+++ b/src/pybind/mgr/dashboard/controllers/grafana.py
@@ -36,7 +36,7 @@ class Grafana(BaseController):
             response['success'] = push_local_dashboards()
         except Exception as e:  # pylint: disable=broad-except
             raise DashboardException(
-                msg=e.message,
+                msg=str(e),
                 component='grafana',
                 http_status_code=500,
             )