From 07ee8f20f319c511dc8746374671dc63e9ded6f7 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: May 13 2021 15:54:27 +0000
Subject: ceph 16.2.3, unbundle cephadm for OSP CI


---

diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index cccabc0..d4f769c 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
@@ -126,7 +127,7 @@
 #################################################################################
 Name:		ceph
 Version:	16.2.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@@ -465,6 +466,7 @@ Recommends:	chrony
 %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
@@ -476,6 +478,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
@@ -675,7 +678,7 @@ Group:		System/Filesystems
 %endif
 Requires:	ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:	python%{python3_pkgversion}-remoto
-Requires:	cephadm >= %{_epoch_prefix}%{version}-%{release}
+Requires:	cephadm >= %{_epoch_prefix}16.1.0-0
 %if 0%{?suse_version}
 Requires:	openssh
 Requires:	python%{python3_pkgversion}-Jinja2
@@ -1430,6 +1433,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
@@ -1437,6 +1441,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}
@@ -1488,6 +1493,10 @@ install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildro
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
 %endif
 
+%if 0%{without cephadm}
+rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
+%endif
+
 #################################################################################
 # files and systemd scriptlets
 #################################################################################
@@ -1574,6 +1583,7 @@ 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
@@ -1591,6 +1601,7 @@ exit 0
 %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
@@ -2506,6 +2517,9 @@ exit 0
 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
 
 %changelog
+* Thu May 13 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.3-2
+- 16.2.3, w/ unbundled cephadm, for OSP CI.
+
 * Thu May 6 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.3-1
 - 16.2.3 GA
 
diff --git a/ceph-16.2.3-2.el8.src.rpm b/ceph-16.2.3-2.el8.src.rpm
deleted file mode 100644
index 45e43c2..0000000
Binary files a/ceph-16.2.3-2.el8.src.rpm and /dev/null differ