From: luo.runbing <luo.runbing@zte.com.cn>
Date: Tue, 17 Sep 2019 06:55:37 +0000 (+0800)
Subject: rpm,deb: python-requests is not needed for ceph-common
X-Git-Tag: v14.2.10~2^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e102420575406616fec59d046998dcbe20d96e01;p=ceph.git

rpm,deb: python-requests is not needed for ceph-common

Signed-off-by: luo.runbing <luo.runbing@zte.com.cn>
(cherry picked from commit 998a3025c0e87638ae7b36a8b44710abb30fff8a)

Conflicts:
	ceph.spec.in: trivial resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index c3904d9b9d34..35a31d3484bc 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -365,7 +365,6 @@ Requires:      grep
 Requires:      logrotate
 Requires:      parted
 Requires:      psmisc
-Requires:      python%{_python_buildid}-requests
 Requires:      python%{_python_buildid}-setuptools
 Requires:      util-linux
 Requires:      xfsprogs
@@ -396,7 +395,6 @@ Requires:	python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
 Requires:	python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
 Requires:	python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
 Requires:	python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_python_buildid}-requests
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	python%{_python_buildid}-prettytable
 %endif
@@ -446,6 +444,7 @@ Group:          System/Filesystems
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{_python_buildid}-bcrypt
 Requires:       python%{_python_buildid}-pecan
+Requires:       python%{_python_buildid}-requests
 Requires:       python%{_python_buildid}-six
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       python%{_python_buildid}-cherrypy
diff --git a/debian/control b/debian/control
index 264a6d6d073d..111724e8dc4d 100644
--- a/debian/control
+++ b/debian/control
@@ -184,11 +184,12 @@ Description: debugging symbols for ceph-mds
 Package: ceph-mgr
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
+         python-bcrypt,
          python-cherrypy3,
          python-jwt,
          python-openssl,
          python-pecan,
-         python-bcrypt,
+         python-requests,
          python-werkzeug,
          ${misc:Depends},
          ${python:Depends},
@@ -512,7 +513,6 @@ Depends: librbd1 (= ${binary:Version}),
          python-prettytable,
          python-rados (= ${binary:Version}),
          python-rbd (= ${binary:Version}),
-         python-requests,
          python-rgw (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},