debian, rpm: add ceph-mgr-modules-standard meta-package

ceph-mgr-modules-core was split into per-module packages so that users
only need to install what they actually use. To ease migration for
existing deployments that want the full former set, add a meta-package
ceph-mgr-modules-standard that pulls in all modules which were
previously bundled in ceph-mgr-modules-core.

Signed-off-by: Kefu Chai <k.chai@proxmox.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index c621db9ccfeadbc324d780075ec4710e092f3aa6..5209351d583f1d696c71abbeb861cee9680106ca 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -769,6 +769,38 @@ Recommends:        ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
 ceph-mgr-modules-core provides a set of modules which are always
 enabled by ceph-mgr.
 
+%package mgr-modules-standard
+BuildArch:      noarch
+Summary:        Ceph Manager modules without heavy external dependencies
+%if 0%{?suse_version}
+Group:          System/Filesystems
+%endif
+Requires:       ceph-mgr-modules-core = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-alerts = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-influx = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-insights = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-iostat = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-localpool = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-mds-autoscaler = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-mirroring = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-nfs = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-nvmeof = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-osd-perf-query = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-osd-support = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-prometheus = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-selftest = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-smb = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-snap-schedule = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-stats = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-telegraf = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-mgr-test-orchestrator = %{_epoch_prefix}%{version}-%{release}
+%description mgr-modules-standard
+ceph-mgr-modules-standard is a meta-package with no files of its own.
+It pulls in the full set of ceph-mgr modules that were formerly shipped
+together in ceph-mgr-modules-core, so that existing users or scripts
+that want the complete standard module set can depend on a single package.
+
 %package mgr-rook
 BuildArch:      noarch
 Summary:        Ceph Manager module for Rook-based orchestration
@@ -2269,6 +2301,8 @@ fi
 %{_datadir}/ceph/mgr/telemetry
 %{_datadir}/ceph/mgr/volumes
 
+%files mgr-modules-standard
+
 %files mgr-alerts
 %{_datadir}/ceph/mgr/alerts
 

diff --git a/debian/control b/debian/control
index 9f45cc31ebd8a8e2410ca0abd6babfe9b09bde53..cf030987d323d8bc18392308f2a858c17b009945 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -321,6 +321,39 @@ Description: ceph manager modules which are always enabled
  This package contains a set of core ceph-mgr modules which are always
  enabled.
 
+Package: ceph-mgr-modules-standard
+Architecture: all
+Depends: ceph-mgr-modules-core (= ${binary:Version}),
+         ceph-mgr-alerts (= ${binary:Version}),
+         ceph-mgr-influx (= ${binary:Version}),
+         ceph-mgr-insights (= ${binary:Version}),
+         ceph-mgr-iostat (= ${binary:Version}),
+         ceph-mgr-localpool (= ${binary:Version}),
+         ceph-mgr-mds-autoscaler (= ${binary:Version}),
+         ceph-mgr-mirroring (= ${binary:Version}),
+         ceph-mgr-nfs (= ${binary:Version}),
+         ceph-mgr-nvmeof (= ${binary:Version}),
+         ceph-mgr-osd-perf-query (= ${binary:Version}),
+         ceph-mgr-osd-support (= ${binary:Version}),
+         ceph-mgr-prometheus (= ${binary:Version}),
+         ceph-mgr-rgw (= ${binary:Version}),
+         ceph-mgr-selftest (= ${binary:Version}),
+         ceph-mgr-smb (= ${binary:Version}),
+         ceph-mgr-snap-schedule (= ${binary:Version}),
+         ceph-mgr-stats (= ${binary:Version}),
+         ceph-mgr-telegraf (= ${binary:Version}),
+         ceph-mgr-test-orchestrator (= ${binary:Version}),
+         ${misc:Depends},
+Description: Ceph Manager modules without heavy external dependencies
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This meta-package has no files of its own. It pulls in the full set of
+ ceph-mgr modules that were formerly shipped together in
+ ceph-mgr-modules-core, so that existing users or scripts that want the
+ complete standard module set can depend on a single package.
+
 Package: ceph-mgr-rook
 Architecture: all
 Depends: ceph-mgr (= ${binary:Version}),