debian,ceph.spec: add ceph-osd-crimson as dependency

a37b5b5bde8c2e8d6890f16b31046119ed55f25d added ceph-osd-crimson as dependency using OR requirement.
Once ceph-osd-classic dependency is satisfied, ceph-osd-crimson package must be added manually.
In order to not add crimson packages manually (See "Containerfile"
removed lines) - mark osd-crimson as dependency if with_crimson is
enabled for rpm and if pkg.ceph.crimson build profile is enabled for debian.

With this change, users won't be required to obtain ceph-osd-crimson
package manually when relevant. Similarly to ceph-osd-classic being
a dependency for ceph-osd.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 1cb69b90b509f58093d7cb586c3e36b0da8df48a..66f2973b5842872bb082eaf954991de59f25bde6 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -912,7 +912,10 @@ Summary:   Ceph Object Storage Daemon
 Group:         System/Filesystems
 %endif
 Requires:      ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:      (ceph-osd-classic = %{_epoch_prefix}%{version}-%{release} or ceph-osd-crimson = %{_epoch_prefix}%{version}-%{release})
+Requires:      ceph-osd-classic = %{_epoch_prefix}%{version}-%{release}
+%if 0%{with crimson}
+Requires:      ceph-osd-crimson = %{_epoch_prefix}%{version}-%{release}
+%endif
 Requires:      sudo
 Requires:      libstoragemgmt
 %if 0%{?weak_deps}

diff --git a/container/Containerfile b/container/Containerfile
index c01472523f5e32324549a3039cd58c8fc8ea84a0..c0a0cbba73990a2e76c4a7b5a895f2c3803c1ebd 100644 (file)
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -150,11 +150,6 @@ libradosstriper1 \
 rbd-mirror" \
 >> packages.txt
 
-# Optional crimson package(s)
-RUN if [[ "${OSD_FLAVOR}" == "crimson-debug" || "${OSD_FLAVOR}" == "crimson-release" ]]; then \
-    echo "ceph-osd-crimson" >> packages.txt ; \
-fi
-
 # Ceph "Recommends"
 RUN echo "nvme-cli python3-saml smartmontools" >> packages.txt
 # NFS-Ganesha

diff --git a/debian/control b/debian/control
index 9b4ade7e336c1bfae965dc22b22a4fa6e7679172..692e5eaa8b978c6557fcabc4331202ea3bda3944 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -416,7 +416,8 @@ Description: debugging symbols for ceph-mon
 
 Package: ceph-osd
 Architecture: linux-any
-Depends: ceph-osd-classic (= ${binary:Version}) | ceph-osd-crimson (= ${binary:Version}),
+Depends: ceph-osd-classic (= ${binary:Version}),
+         ceph-osd-crimson (= ${binary:Version}) <pkg.ceph.crimson>,
          sudo,
          ${python3:Depends},
          ${misc:Depends},