From 5477477e4289cae67a4aae9353bbd516fbab6938 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 15 Dec 2020 22:17:41 +0100 Subject: [PATCH] rpm: require smartmontools on SUSE SUSE container images are built using a process that excludes dependencies that are merely recommended. Fixes: https://tracker.ceph.com/issues/48604 Signed-off-by: Nathan Cutler (cherry picked from commit c7e160a381b40c59771a61ec2b5ee6d03b6816a8) Conflicts: ceph.spec.in - trivial resolution --- ceph.spec.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index d2e8c8ffdc8..2a4e111bcf3 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -474,8 +474,12 @@ Provides: ceph-test:/usr/bin/ceph-monstore-tool Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} Recommends: nvme-cli +%if 0%{?suse_version} +Requires: smartmontools +%else Recommends: smartmontools %endif +%endif %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file system. One or more instances of ceph-mon form a Paxos part-time @@ -754,8 +758,12 @@ Requires: libstoragemgmt Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} Recommends: nvme-cli +%if 0%{?suse_version} +Requires: smartmontools +%else Recommends: smartmontools %endif +%endif %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 -- 2.47.3