From: Kefu Chai <kchai@redhat.com>
Date: Fri, 23 Jul 2021 10:55:18 +0000 (+0800)
Subject: debian: split ceph-volume into a separated package
X-Git-Tag: v17.1.0~879^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6c260f15beec0f3669d611892d1d7e579a819f0;p=ceph.git

debian: split ceph-volume into a separated package

ceph-volume is a tool implemented in pure python, so it would be better
to make it a architecture independent package for better
maintainability.

in this change

* ceph-volume is extracted out into a separated package
* ceph-volume depends on ceph-osd, as it deploys it and relies on
  an already-installed ceph-osd in the system.
* ceph-osd recommends ceph-volume. as ceph-osd can be used as a
  standalone package. but ceph-volume enhances it. also, to ensure
  the existing users to get ceph-volume installed along with
  ceph-osd.

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

diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
index 0db4460da8ab..2a8ac886338d 100755
--- a/debian/ceph-osd.install
+++ b/debian/ceph-osd.install
@@ -1,7 +1,6 @@
 #! /usr/bin/dh-exec
 
 lib/systemd/system/ceph-osd*
-lib/systemd/system/ceph-volume@.service
 usr/bin/ceph-bluestore-tool
 usr/bin/ceph-clsinfo
 usr/bin/ceph-erasure-code-tool
@@ -13,13 +12,7 @@ usr/bin/ceph_objectstore_bench
 usr/libexec/ceph/ceph-osd-prestart.sh
 usr/lib/libos_tp.so*
 usr/lib/libosd_tp.so*
-usr/sbin/ceph-volume
-usr/sbin/ceph-volume-systemd
-usr/lib/python*/dist-packages/ceph_volume/*
-usr/lib/python*/dist-packages/ceph_volume-*
 usr/share/man/man8/ceph-clsinfo.8
-usr/share/man/man8/ceph-volume.8
-usr/share/man/man8/ceph-volume-systemd.8
 usr/share/man/man8/ceph-osd.8
 usr/share/man/man8/ceph-bluestore-tool.8
 etc/sysctl.d/30-ceph-osd.conf
diff --git a/debian/ceph-volume.install b/debian/ceph-volume.install
new file mode 100644
index 000000000000..b43f08ae8281
--- /dev/null
+++ b/debian/ceph-volume.install
@@ -0,0 +1,7 @@
+lib/systemd/system/ceph-volume@.service
+usr/lib/python*/dist-packages/ceph_volume/*
+usr/lib/python*/dist-packages/ceph_volume-*
+usr/sbin/ceph-volume
+usr/sbin/ceph-volume-systemd
+usr/share/man/man8/ceph-volume.8
+usr/share/man/man8/ceph-volume-systemd.8
diff --git a/debian/control b/debian/control
index 0a7405533398..7b845cf3331c 100644
--- a/debian/control
+++ b/debian/control
@@ -404,14 +404,19 @@ Description: debugging symbols for ceph-mon
 Package: ceph-osd
 Architecture: linux-any
 Depends: ceph-base (= ${binary:Version}),
-         lvm2,
-         parted,
          sudo,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
-Replaces: ceph (<< 10), ceph-test (<< 12.2.2-14)
-Breaks: ceph (<< 10), ceph-test (<< 12.2.2-14)
+Replaces: ceph (<< 10),
+          ceph-test (<< 12.2.2-14),
+          ceph-osd (<< 17.0.0)
+Breaks: ceph (<< 10),
+        ceph-test (<< 12.2.2-14),
+        ceph-osd (<< 17.0.0)
+Recommends: ceph-volume (= ${binary:Version}),
+            nvme-cli,
+            smartmontools,
 Description: OSD server for the ceph storage system
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,
@@ -434,6 +439,23 @@ Description: debugging symbols for ceph-osd
  .
  This package contains the debugging symbols for ceph-osd.
 
+Package: ceph-volume
+Architecture: all
+Section: python
+Depends: ceph-osd (= ${binary:Version}),
+         lvm2,
+         parted,
+         ${misc:Depends},
+         ${python3:Depends}
+Description: tool to facilidate OSD deployment
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains a tool to deploy OSD with different devices like
+ lvm or physical disks, and trying to follow a predictable, and robust
+ way of preparing, activating, and starting the deployed OSD.
+
 Package: ceph-fuse
 Architecture: linux-any
 Depends: ${misc:Depends},