packaging: move parted requirement to -osd subpkg

Prior to this change, ceph-base required the "parted" package, which
meant that any installation of ceph-osd, ceph-mon, or ceph-mds would
pull in the parted package.

Move the parted dependency to ceph-osd, since ceph-disk is the only
thing that uses parted.

The advantage of this change is that Mon and MDS systems will not need
to install the parted package.

Fixes: http://tracker.ceph.com/issues/16095
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 115349680bad520a0aa56ce3a346d93f541a905c)

diff --git a/ceph.spec.in b/ceph.spec.in
index 3cf6307f117738118088c944226d755328deba5d..c7ff05213f2a5c61334a734634fd09eae2d16768 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -197,7 +197,6 @@ Requires:      python-setuptools
 Requires:      grep
 Requires:      xfsprogs
 Requires:      logrotate
-Requires:      parted
 Requires:      util-linux
 Requires:      hdparm
 Requires:      cryptsetup
@@ -342,6 +341,7 @@ Requires:   gdisk
 %if 0%{?suse_version}
 Requires:      gptfdisk
 %endif
+Requires:       parted
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file
 system.  It is responsible for storing objects on a local file system

diff --git a/debian/control b/debian/control
index f774a30fc11100f8a681f82818bd6218003be3b4..3e036892a041cd96f338bf2c2863c87ae8350d6e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,6 @@ Depends: binutils,
          grep,
          logrotate,
          lsb-release,
-         parted,
          python,
          python-argparse | libpython2.7-stdlib,
          python-pkg-resources,
@@ -179,7 +178,10 @@ Description: debugging symbols for ceph-mon
 
 Package: ceph-osd
 Architecture: linux-any
-Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ceph-base (= ${binary:Version}),
+         parted,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: ceph-common (= ${binary:Version})
 Replaces: ceph (<< 10)
 Breaks: ceph (<< 10)