diff --git a/.ceph.metadata b/.ceph.metadata
index e30ef94..cb4918b 100644
--- a/.ceph.metadata
+++ b/.ceph.metadata
@@ -1 +1 @@
-bdff32b32a0ce20d168ac3f8ac38277a38bc46a0 SOURCES/ceph-16.2.6.tar.gz
+94e58f4c16cd86d255a6a306181dd5050a3246fe SOURCES/ceph-16.2.7.tar.gz
diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec
index f97916a..455aa09 100644
--- a/SPECS/ceph.spec
+++ b/SPECS/ceph.spec
@@ -32,12 +32,12 @@
%else
%bcond_without tcmalloc
%endif
+%bcond_with system_pmdk
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
%ifarch x86_64 ppc64le
%bcond_without rbd_rwl_cache
%bcond_without rbd_ssd_cache
-%global _system_pmdk 1
%else
%bcond_with rbd_rwl_cache
%bcond_with rbd_ssd_cache
@@ -64,12 +64,10 @@
%bcond_with libradosstriper
%ifarch x86_64 aarch64 ppc64le
%bcond_without lttng
-%global _system_pmdk 1
%bcond_without rbd_rwl_cache
%bcond_without rbd_ssd_cache
%else
%bcond_with lttng
-%global _system_pmdk 0
%bcond_with rbd_rwl_cache
%bcond_with rbd_ssd_cache
%endif
@@ -130,7 +128,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 16.2.6
+Version: 16.2.7
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -274,7 +272,7 @@ BuildRequires: nlohmann_json-devel
BuildRequires: libevent-devel
BuildRequires: yaml-cpp-devel
%endif
-%if 0%{?_system_pmdk}
+%if 0%{with system_pmdk}
BuildRequires: libpmem-devel
BuildRequires: libpmemobj-devel
%endif
@@ -460,6 +458,12 @@ Requires: gperftools-libs >= 2.6.1
%endif
%if 0%{?weak_deps}
Recommends: chrony
+Recommends: nvme-cli
+%if 0%{?suse_version}
+Requires: smartmontools
+%else
+Recommends: smartmontools
+%endif
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
@@ -531,14 +535,6 @@ Group: System/Filesystems
%endif
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
%if 0%{with jaeger}
Requires: libjaeger = %{_epoch_prefix}%{version}-%{release}
%endif
@@ -809,14 +805,6 @@ Requires: lvm2
Requires: sudo
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
@@ -1376,7 +1364,7 @@ cd build
%if 0%{with ceph_test_package}
-DWITH_SYSTEM_GTEST:BOOL=ON \
%endif
-%if 0%{?_system_pmdk}
+%if 0%{with system_pmdk}
-DWITH_SYSTEM_PMDK:BOOL=ON \
%endif
-DWITH_SYSTEM_ZSTD:BOOL=ON \
@@ -1451,7 +1439,7 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
# sudoers.d
-install -m 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
+install -m 0440 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl
%if 0%{?rhel} >= 8
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
@@ -1553,6 +1541,7 @@ rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
+%{_sysconfdir}/sudoers.d/ceph-smartctl
%post base
/sbin/ldconfig
@@ -2141,7 +2130,6 @@ fi
%{_unitdir}/ceph-volume@.service
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
%config(noreplace) %{_sysctldir}/90-ceph-osd.conf
-%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
%post osd
%if 0%{?suse_version}
@@ -2442,13 +2430,21 @@ if diff ${FILE_CONTEXT} ${FILE_CONTEXT}.pre > /dev/null 2>&1; then
exit 0
fi
+# Stop ceph.target while relabeling if CEPH_AUTO_RESTART_ON_UPGRADE=yes
+SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
+if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
+ source $SYSCONF_CEPH
+fi
+
# Check whether the daemons are running
/usr/bin/systemctl status ceph.target > /dev/null 2>&1
STATUS=$?
# Stop the daemons if they were running
if test $STATUS -eq 0; then
- /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+ /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+ fi
fi
# Relabel the files fix for first package install
@@ -2460,7 +2456,9 @@ rm -f ${FILE_CONTEXT}.pre
# Start the daemons iff they were running before
if test $STATUS -eq 0; then
- /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+ /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+ fi
fi
exit 0
@@ -2480,13 +2478,21 @@ if [ $1 -eq 0 ]; then
exit 0
fi
+ # Stop ceph.target while relabeling if CEPH_AUTO_RESTART_ON_UPGRADE=yes
+ SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
+ if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
+ source $SYSCONF_CEPH
+ fi
+
# Check whether the daemons are running
/usr/bin/systemctl status ceph.target > /dev/null 2>&1
STATUS=$?
# Stop the daemons if they were running
if test $STATUS -eq 0; then
- /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+ /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
+ fi
fi
/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
@@ -2496,7 +2502,9 @@ if [ $1 -eq 0 ]; then
# Start the daemons if they were running before
if test $STATUS -eq 0; then
- /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+ if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
+ /usr/bin/systemctl start ceph.target > /dev/null 2>&1 || :
+ fi
fi
fi
exit 0
@@ -2520,6 +2528,9 @@ exit 0
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
%changelog
+* Tue Dec 7 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.7-1
+- 16.2.7 GA
+
* Fri Sep 17 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.2.6-1
- 16.2.6 GA