From: Patrick Seidensal <pseidensal@suse.com>
Date: Tue, 25 Feb 2020 14:13:43 +0000 (+0100)
Subject: rpm,deb: poke Python OpenSSL dependencies
X-Git-Tag: v15.1.1~236^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c0c7f7daccf7e161d0eac8f120b585e0f1523add;p=ceph-ci.git

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 ecf33da8095..36d71e68e58 100644
--- 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 bb847d60bca..6bab4452c15 100644
--- 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