rpm,deb: poke Python OpenSSL dependencies

to ceph-mgr-modules-core package.

Fixes: https://tracker.ceph.com/issues/44306
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index ecf33da8095fddc9d4f6a8a77cacad69a17e394f..36d71e68e5815ebda3be703e7ee8728d3baa66cf 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -527,11 +527,6 @@ Requires:       python%{python3_pkgversion}-PyJWT
 Requires:       python%{python3_pkgversion}-Routes
 Requires:       python%{python3_pkgversion}-Werkzeug
 %endif
-%if 0%{?rhel} == 7
-Requires:       pyOpenSSL
-%else
-Requires:       python%{python3_pkgversion}-pyOpenSSL
-%endif
 %description mgr-dashboard
 ceph-mgr-dashboard is a manager module, providing a web-based application
 to monitor and manage many aspects of a Ceph cluster and related components.

diff --git a/debian/control b/debian/control
index bb847d60bca15ab6d5588a5467b4bd37908e7b41..6bab4452c154a512e548abad5c32132786c1ea18 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -244,7 +244,6 @@ Architecture: all
 Depends: ceph-mgr (= ${binary:Version}),
          python3-cherrypy3,
          python3-jwt,
-         python3-openssl,
          python3-bcrypt,
          python3-werkzeug,
          python3-routes,
@@ -299,6 +298,7 @@ Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
+         python3-openssl,
 Replaces: ceph-mgr (<< 15.1.0)
 Breaks: ceph-mgr (<< 15.1.0)
 Recommends: ceph-mgr-rook