From 6cc4a33933109bd9cd333034a538b2cc3621f56a Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 19 Dec 2017 11:41:08 +0000 Subject: [PATCH] packaging: explicit jinja2 dependency for dashboard We were getting this via python-flask, when mgr was installed on nodes with ceph-mon, but for correctness in general we should depend on it from ceph-mgr (it is imported by the dashboard module). Fixes: http://tracker.ceph.com/issues/22457 Signed-off-by: John Spray (cherry picked from commit 87399bea8321a7a9ab554085be3a3d5e0563f27f) --- ceph.spec.in | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 1b1a23b1fd19..d6743d12c4b7 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -323,11 +323,13 @@ Group: System/Filesystems Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} Requires: python-cherrypy +Requires: python-jinja2 Requires: python-werkzeug Requires: pyOpenSSL %endif %if 0%{?suse_version} Requires: python-CherryPy +Requires: python-Jinja2 Requires: python-Werkzeug Requires: python-pyOpenSSL %endif diff --git a/debian/control b/debian/control index 28f235ba9832..c9775fea347b 100644 --- a/debian/control +++ b/debian/control @@ -50,6 +50,7 @@ Build-Depends: bc, python (>= 2.7), python-all-dev, python-cherrypy3, + python-jinja2, python-nose, python-pecan, python-prettytable, -- 2.47.3