From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 20 Feb 2019 15:12:31 +0000 (-0500)
Subject: Revert "ceph.spec.in: python-kubernetes broken on rhel"
X-Git-Tag: v14.1.1~142^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=196e8151b51eda3d251692b0c006fa7ee31c7a25;p=ceph-ci.git

Revert "ceph.spec.in: python-kubernetes broken on rhel"

This reverts commit c32c4874e139d0e97116d6f3d368ac9c3e393c9f.

An updated python2-kubernetes package that does not depend on
python-adal has made it into the epel7 repos. With that change,
we can now revert this patch.

When we readd it back though, add in %{_python_buildid} so that
this works correctly on python3-based distros as well.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8f004e294a1..8790e6cec50 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -505,6 +505,7 @@ Summary:        ceph-mgr rook plugin
 Group:          System/Filesystems
 %endif
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires:       python%{_python_buildid}-kubernetes
 %description mgr-rook
 ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using
 a Rook backend.