diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index ab352d5..046a1b9 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -22,6 +22,7 @@ ################################################################################# %global _hardened_build 1 +%bcond_with cephadm %bcond_with make_check %bcond_with zbd %bcond_with cmake_verbose_logging @@ -150,7 +151,7 @@ ################################################################################# Name: ceph Version: 17.1.0 -Release: 0.2.rc1%{?dist} +Release: 0.3.rc1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -486,6 +487,7 @@ Recommends: smartmontools %description base Base is the package that includes all the files shared amongst ceph servers +%if 0%{with cephadm} %package -n cephadm Summary: Utility to bootstrap Ceph clusters BuildArch: noarch @@ -499,6 +501,7 @@ Recommends: podman >= 2.0.2 %description -n cephadm Utility to bootstrap a Ceph cluster and manage Ceph daemons deployed with systemd and podman. +%endif %package -n ceph-common Summary: Ceph Common @@ -1429,6 +1432,7 @@ install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce +%if 0%{with cephadm} install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm mkdir -p %{buildroot}%{_sharedstatedir}/cephadm chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm @@ -1436,6 +1440,7 @@ mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys +%endif # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} && !0%{?usrmerged} @@ -1487,6 +1492,10 @@ install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/p %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib} %endif +%if 0%{without cephadm} +rm -f %{buildroot}%{_mandir}/man8/cephadm.8* +%endif + ################################################################################# # files and systemd scriptlets ################################################################################# @@ -1570,23 +1579,29 @@ fi /sbin/ldconfig %systemd_postun ceph.target +%if 0%{with cephadm} %pre -n cephadm getent group cephadm >/dev/null || groupadd -r cephadm getent passwd cephadm >/dev/null || useradd -r -g cephadm -s /bin/bash -c "cephadm user for mgr/cephadm" -d %{_sharedstatedir}/cephadm cephadm exit 0 +%endif +%if 0%{with cephadm} %if ! 0%{?suse_version} %postun -n cephadm userdel -r cephadm || true exit 0 %endif +%endif +%if 0%{with cephadm} %files -n cephadm %{_sbindir}/cephadm %{_mandir}/man8/cephadm.8* %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm %attr(0700,cephadm,cephadm) %dir %{_sharedstatedir}/cephadm/.ssh %attr(0600,cephadm,cephadm) %{_sharedstatedir}/cephadm/.ssh/authorized_keys +%endif %files common %dir %{_docdir}/ceph @@ -2548,6 +2563,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed Mar 2 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.3.rc1 +- 17.1.0, w/o cephadm + * Tue Mar 1 2022 Kaleb S. KEITHLEY - 2:17.1.0-0.2.rc1 - 17.1.0 revised patch