Accepting request 960320 from filesystems:ceph:pacific
OBS-URL: https://build.opensuse.org/request/show/960320 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=312
This commit is contained in:
Stefen Allen
Git OBS Bridge
parent
dd4480f248
commit
848444b174
@ -10,7 +10,7 @@
|
||||
</conditions>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">36</size>
|
||||
<size unit="G">52</size>
|
||||
</disk>
|
||||
<physicalmemory>
|
||||
<size unit="G">8</size>
|
||||
@ -40,7 +40,7 @@
|
||||
</conditions>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">36</size>
|
||||
<size unit="G">52</size>
|
||||
</disk>
|
||||
<physicalmemory>
|
||||
<size unit="G">8</size>
|
||||
@ -70,7 +70,7 @@
|
||||
</conditions>
|
||||
<hardware>
|
||||
<disk>
|
||||
<size unit="G">52</size>
|
||||
<size unit="G">64</size>
|
||||
</disk>
|
||||
<physicalmemory>
|
||||
<size unit="G">10</size>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5daf1de4a3a62477f096fbc2b12fd2afc6467fd3dab02ee27c3ef2302d62d560
|
||||
size 127818138
|
||||
3
ceph-16.2.7-596-g7d574789716.tar.bz2
Normal file
3
ceph-16.2.7-596-g7d574789716.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dfaf452cc8f4d13466743ef173cc19379e34757e576b70e213836cfefc3505ac
|
||||
size 128384155
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 8 21:43:24 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-596-g7d574789716
|
||||
+ Update Prometheus Container image paths (pr #459)
|
||||
+ mgr/dashboard: Fix documentation URL (pr #456)
|
||||
+ Update Prometheus Container image paths (pr #458)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 4 19:35:37 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-577-g3e3603b5dd1
|
||||
+ Update prometheus-server version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 21:24:48 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-37-gb3be69440db:
|
||||
+ (bsc#1194353) Downstream branding breaks dashboard npm build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
|
||||
@ -30,12 +30,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
|
||||
@ -61,12 +61,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
|
||||
@ -127,7 +125,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 16.2.6.463+g22e7612f9ad
|
||||
Version: 16.2.7.596+g7d574789716
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@ -143,7 +141,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
|
||||
Group: System/Filesystems
|
||||
%endif
|
||||
URL: http://ceph.com/
|
||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.6-463-g22e7612f9ad.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.7-596-g7d574789716.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
Source94: ceph-rpmlintrc
|
||||
Source95: checkin.sh
|
||||
@ -265,7 +263,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
|
||||
@ -422,6 +420,8 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%endif
|
||||
@ -441,10 +441,6 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{with jaeger}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
@ -507,10 +503,6 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%endif
|
||||
%if 0%{with seastar}
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
@ -594,7 +586,7 @@ This package contains Ceph benchmarks and test tools.
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-16.2.6-463-g22e7612f9ad
|
||||
%autosetup -p1 -n ceph-16.2.7-596-g7d574789716
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
@ -724,7 +716,7 @@ ${CMAKE} .. \
|
||||
%if 0%{with rbd_ssd_cache}
|
||||
-DWITH_RBD_SSD_CACHE=ON \
|
||||
%endif
|
||||
%if 0%{?_system_pmdk}
|
||||
%if 0%{with system_pmdk}
|
||||
-DWITH_SYSTEM_PMDK:BOOL=ON \
|
||||
%endif
|
||||
-DBOOST_J=$CEPH_SMP_NCPUS \
|
||||
@ -795,7 +787,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}/*
|
||||
@ -868,6 +860,7 @@ rm -rf %{buildroot}%{_mandir}/man8/crushtool.8*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/monmaptool.8*
|
||||
rm -rf %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
|
||||
rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl
|
||||
rm -rf %{buildroot}%{_sbindir}/cephadm
|
||||
rm -rf %{buildroot}%{_mandir}/man8/cephadm.8*
|
||||
rm -rf %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
||||
@ -1018,7 +1011,6 @@ rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service
|
||||
rm -rf %{buildroot}%{_unitdir}/ceph-osd.target
|
||||
rm -rf %{buildroot}%{_unitdir}/ceph-volume@.service
|
||||
rm -rf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
||||
rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
|
||||
rm -rf %{buildroot}%{_bindir}/crimson-osd
|
||||
rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd
|
||||
rm -rf %{buildroot}%{_libdir}/librados.so.*
|
||||
|
||||
20
ceph.changes
20
ceph.changes
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 8 22:33:00 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-596-g7d574789716
|
||||
+ Update Prometheus Container image paths (pr #459)
|
||||
+ mgr/dashboard: Fix documentation URL (pr #456)
|
||||
+ mgr/dashboard: Adapt downstream branded navigation page (pr #454)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 4 19:35:37 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-577-g3e3603b5dd1
|
||||
+ Update prometheus-server version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 10 21:24:48 UTC 2022 - Stefen Allen <stefen.allen@suse.com>
|
||||
|
||||
- Update to 16.2.7-37-gb3be69440db:
|
||||
+ (bsc#1194353) Downstream branding breaks dashboard npm build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:57:53 UTC 2021 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
|
||||
40
ceph.spec
40
ceph.spec
@ -30,12 +30,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
|
||||
@ -61,12 +61,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
|
||||
@ -127,7 +125,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 16.2.6.463+g22e7612f9ad
|
||||
Version: 16.2.7.596+g7d574789716
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@ -143,7 +141,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
|
||||
Group: System/Filesystems
|
||||
%endif
|
||||
URL: http://ceph.com/
|
||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.6-463-g22e7612f9ad.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-16.2.7-596-g7d574789716.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
# _insert_obs_source_lines_here
|
||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
||||
@ -255,7 +253,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
|
||||
@ -439,6 +437,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
|
||||
@ -510,14 +514,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
|
||||
@ -788,14 +784,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
|
||||
@ -1211,7 +1199,7 @@ This package provides Ceph default alerts for Prometheus.
|
||||
# common
|
||||
#################################################################################
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-16.2.6-463-g22e7612f9ad
|
||||
%autosetup -p1 -n ceph-16.2.7-596-g7d574789716
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
@ -1341,7 +1329,7 @@ ${CMAKE} .. \
|
||||
%if 0%{with rbd_ssd_cache}
|
||||
-DWITH_RBD_SSD_CACHE=ON \
|
||||
%endif
|
||||
%if 0%{?_system_pmdk}
|
||||
%if 0%{with system_pmdk}
|
||||
-DWITH_SYSTEM_PMDK:BOOL=ON \
|
||||
%endif
|
||||
-DBOOST_J=$CEPH_SMP_NCPUS \
|
||||
@ -1412,7 +1400,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}/*
|
||||
@ -1517,6 +1505,7 @@ rm -rf %{buildroot}
|
||||
%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
|
||||
@ -2094,7 +2083,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}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user