From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 27 Feb 2019 08:26:48 +0000 (+0100)
Subject: rpm: re-add pyOpenSSL as ceph-mgr runtime dependency
X-Git-Tag: v14.1.1~49^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa690517fbda299e5b70d4d1da39662afb0c2778;p=ceph.git

rpm: re-add pyOpenSSL as ceph-mgr runtime dependency

The "restful" MGR module is part of ceph-mgr, and is active by default when
deploying a Ceph cluster from scratch.

Without this patch, the cluster never reaches HEALTH_OK due to the following
health warning: "Module 'restful' has failed dependency: No module named
'OpenSSL'"

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index a12ceade0f7e3..0ffa5da0d1407 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -445,6 +445,11 @@ Recommends:	ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release
 Recommends:	ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
 Recommends:	ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
 %endif
+%if 0%{?rhel} == 7
+Requires:       pyOpenSSL
+%else
+Requires:       python%{_python_buildid}-pyOpenSSL
+%endif
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
 module derived from Calamari) and expose CLI hooks.  ceph-mgr gathers