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

a37b5b5 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 <[email protected]>

Author: Matan-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}

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

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},