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 <john.spray@redhat.com>
(cherry picked from commit 87399bea8321a7a9ab554085be3a3d5e0563f27f)

diff --git a/ceph.spec.in b/ceph.spec.in
index 1b1a23b1fd19c442ea50e67e0ddc0470a33a98bd..d6743d12c4b794a4279ed82de39cac4b9d0d56fa 100644 (file)
--- 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 28f235ba9832ea7aa73a8f8a63e4e4cc9091c495..c9775fea347bf0ee7c800f941735fcfbd9afd7bc 100644 (file)
--- 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,