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: v15.1.0~1436^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=998a3025c0e87638ae7b36a8b44710abb30fff8a;p=ceph.git

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

Signed-off-by: luo.runbing <luo.runbing@zte.com.cn>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 503eab6f243..fc88830ecae 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -363,7 +363,6 @@ Requires:      grep
 Requires:      logrotate
 Requires:      parted
 Requires:      psmisc
-Requires:      python%{_python_buildid}-requests
 Requires:      python%{_python_buildid}-setuptools
 Requires:      util-linux
 Requires:      xfsprogs
@@ -395,7 +394,6 @@ 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}-ceph-common = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_python_buildid}-requests
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	python%{_python_buildid}-prettytable
 %endif
@@ -445,6 +443,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 56a15bfa0da..cfe67947d39 100644
--- a/debian/control
+++ b/debian/control
@@ -198,11 +198,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},
@@ -553,7 +554,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},