From: Kefu Chai <kchai@redhat.com>
Date: Thu, 24 Jun 2021 03:43:03 +0000 (+0800)
Subject: ceph.spec.in: move ceph_volume python module into ceph-osd
X-Git-Tag: v17.1.0~1537^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3c770cca8801246e797447557b1a8a445a306b1;p=ceph.git

ceph.spec.in: move ceph_volume python module into ceph-osd

the ceph-volume tool is composed of the cli frontend and ceph_volume
python module. in 02bc369e052125f50c7d3a7fe9b311215291c84d, its cli
frontend is moved from ceph-base package to ceph-osd. but the python
module was left in ceph-base.

since the only consumer of ceph_volume python package is ceph-volume,
better off moving this python module into ceph-osd. this also aligns
the rpm packaging with the deb packaging, where ceph-osd deb package
also include ceph_volume python module.

we could extract ceph-volumne into its own package, so it can be an
arch-independent package. let's leave it as a follow-up change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index b70ced59079..1b67c3cd62a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1499,9 +1499,6 @@ rm -rf %{buildroot}
 %{_fillupdir}/sysconfig.*
 %endif
 %{_unitdir}/ceph.target
-%dir %{python3_sitelib}/ceph_volume
-%{python3_sitelib}/ceph_volume/*
-%{python3_sitelib}/ceph_volume-*
 %{_mandir}/man8/ceph-deploy.8*
 %{_mandir}/man8/ceph-create-keys.8*
 %{_mandir}/man8/ceph-run.8*
@@ -2093,6 +2090,9 @@ fi
 %{_libexecdir}/ceph/ceph-osd-prestart.sh
 %{_sbindir}/ceph-volume
 %{_sbindir}/ceph-volume-systemd
+%dir %{python3_sitelib}/ceph_volume
+%{python3_sitelib}/ceph_volume/*
+%{python3_sitelib}/ceph_volume-*
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-osd.8*
 %{_mandir}/man8/ceph-bluestore-tool.8*