Accepting request 789875 from filesystems:ceph:octopus
stable octopus to Factory OBS-URL: https://build.opensuse.org/request/show/789875 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=265
This commit is contained in:
Git OBS Bridge
parent
f6f34b676f
commit
0d3ea8cce3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:59333d6ed9be258d6c890e0a16d77f5ab48504305640ef9a85221dccd6f00a5b
|
||||
size 154978336
|
||||
3
ceph-15.2.0-108-g8cf4f02b08.tar.bz2
Normal file
3
ceph-15.2.0-108-g8cf4f02b08.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e8fa2af1d3e6ce0612f1afb93cfe468c8ec837911aaca898245e352b33cdeb79
|
||||
size 151050459
|
||||
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 30 13:08:29 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.2.0-108-g8cf4f02b08:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 9267cc03e1b1612109dd57cc6ce74c34ed1f1d00
|
||||
* cephadm: Fix truncated output of "ceph mgr dump"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 24 16:20:46 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.2.0-29-g274f7bc2e7:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 a8062613c81ad08815edcdf06e668fcc77270a03
|
||||
* upstream 15.2.0 (first Octopus stable) release
|
||||
https://ceph.io/releases/v15-2-0-octopus-released/
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 23 11:20:40 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.1-220-g0f87374dc1:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 243cbd6224921f7f5c2463705c75cb9eafd0db5c
|
||||
* upstream 15.1.1 (Octopus release candidate) release
|
||||
https://github.com/ceph/ceph/releases/tag/v15.1.1
|
||||
+ cephadm: read everything when calling "ceph mgr dump"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 13 11:08:51 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.0-2160-g310e512e18:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 465f3855623e30f3b4694f3090adbe27c8cd49c3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 5 12:33:00 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.0-1766-g3d31471523:
|
||||
+ rebase on tip of upstream master, SHA1 25b8ecc216b02e848f9719ced8c84670de656e78
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph-test
|
||||
Version: 15.1.0.1521+gcdf35413a0
|
||||
Version: 15.2.0.108+g8cf4f02b08
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@ -120,7 +120,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-15.1.0-1521-gcdf35413a0.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-15.2.0-108-g8cf4f02b08.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
Source96: checkin.sh
|
||||
Source97: README-checkin.txt
|
||||
@ -396,6 +396,8 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{?weak_deps}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
@ -544,10 +546,8 @@ This package contains Ceph benchmarks and test tools.
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
%endif
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-15.1.0-1521-gcdf35413a0
|
||||
%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
@ -753,11 +753,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
|
||||
|
||||
# prometheus alerts
|
||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# create __pycache__ directories and their contents
|
||||
%py3_compile %{buildroot}%{python3_sitelib}
|
||||
# prometheus alerts
|
||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
|
||||
# hardlink duplicate files under /usr to save space
|
||||
%fdupes %{buildroot}%{_prefix}
|
||||
%endif
|
||||
@ -1010,7 +1011,7 @@ rm -rf %{buildroot}%doc
|
||||
rm -rf %{buildroot}monitoring/grafana/dashboards/README
|
||||
rm -rf %{buildroot}%doc
|
||||
rm -rf %{buildroot}monitoring/grafana/README.md
|
||||
rm -rf %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
|
||||
rm -rf %{buildroot}%{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
dirs=`find %{buildroot} -type d -empty`
|
||||
while [[ -n $dirs ]]; do
|
||||
|
||||
36
ceph.changes
36
ceph.changes
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 30 13:08:29 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.2.0-108-g8cf4f02b08:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 9267cc03e1b1612109dd57cc6ce74c34ed1f1d00
|
||||
* cephadm: Fix truncated output of "ceph mgr dump"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 24 16:20:46 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.2.0-29-g274f7bc2e7:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 a8062613c81ad08815edcdf06e668fcc77270a03
|
||||
* upstream 15.2.0 (first Octopus stable) release
|
||||
https://ceph.io/releases/v15-2-0-octopus-released/
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 23 11:20:40 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.1-220-g0f87374dc1:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 243cbd6224921f7f5c2463705c75cb9eafd0db5c
|
||||
* upstream 15.1.1 (Octopus release candidate) release
|
||||
https://github.com/ceph/ceph/releases/tag/v15.1.1
|
||||
+ cephadm: read everything when calling "ceph mgr dump"
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 13 11:08:51 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.0-2160-g310e512e18:
|
||||
+ rebase on tip of upstream "octopus" branch, SHA1 465f3855623e30f3b4694f3090adbe27c8cd49c3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 5 12:33:00 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
- Update to 15.1.0-1766-g3d31471523:
|
||||
+ rebase on tip of upstream master, SHA1 25b8ecc216b02e848f9719ced8c84670de656e78
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler <ncutler@suse.com>
|
||||
|
||||
|
||||
30
ceph.spec
30
ceph.spec
@ -104,7 +104,7 @@
|
||||
# main package definition
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 15.1.0.1521+gcdf35413a0
|
||||
Version: 15.2.0.108+g8cf4f02b08
|
||||
Release: 0%{?dist}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Epoch: 2
|
||||
@ -120,7 +120,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-15.1.0-1521-gcdf35413a0.tar.bz2
|
||||
Source0: %{?_remote_tarball_prefix}ceph-15.2.0-108-g8cf4f02b08.tar.bz2
|
||||
%if 0%{?suse_version}
|
||||
# _insert_obs_source_lines_here
|
||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
||||
@ -421,6 +421,9 @@ Base is the package that includes all the files shared amongst ceph servers
|
||||
%package -n cephadm
|
||||
Summary: Utility to bootstrap Ceph clusters
|
||||
Requires: lvm2
|
||||
%if 0%{?suse_version}
|
||||
Requires: apparmor-abstractions
|
||||
%endif
|
||||
Requires: python%{python3_pkgversion}
|
||||
%if 0%{?weak_deps}
|
||||
Recommends: podman
|
||||
@ -521,6 +524,7 @@ Group: System/Filesystems
|
||||
%endif
|
||||
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
|
||||
Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release}
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
Requires: python%{python3_pkgversion}-cherrypy
|
||||
Requires: python%{python3_pkgversion}-jwt
|
||||
@ -1107,20 +1111,18 @@ collecting data from Ceph Manager "prometheus" module and Prometheus
|
||||
project "node_exporter" module. The dashboards are designed to be
|
||||
integrated with the Ceph Manager Dashboard web UI.
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%package prometheus-alerts
|
||||
Summary: Prometheus alerts for a Ceph deplyoment
|
||||
BuildArch: noarch
|
||||
Group: System/Monitoring
|
||||
%description prometheus-alerts
|
||||
This package provides Ceph’s default alerts for Prometheus.
|
||||
%endif
|
||||
|
||||
#################################################################################
|
||||
# common
|
||||
#################################################################################
|
||||
%prep
|
||||
%autosetup -p1 -n ceph-15.1.0-1521-gcdf35413a0
|
||||
%autosetup -p1 -n ceph-15.2.0-108-g8cf4f02b08
|
||||
|
||||
%build
|
||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||
@ -1326,11 +1328,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
|
||||
|
||||
# prometheus alerts
|
||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
%if 0%{?suse_version}
|
||||
# create __pycache__ directories and their contents
|
||||
%py3_compile %{buildroot}%{python3_sitelib}
|
||||
# prometheus alerts
|
||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
|
||||
# hardlink duplicate files under /usr to save space
|
||||
%fdupes %{buildroot}%{_prefix}
|
||||
%endif
|
||||
@ -2337,21 +2340,18 @@ exit 0
|
||||
%if 0%{?suse_version}
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%else
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%endif
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
|
||||
%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
|
||||
%doc monitoring/grafana/dashboards/README
|
||||
%doc monitoring/grafana/README.md
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%files prometheus-alerts
|
||||
%dir /etc/prometheus/SUSE/
|
||||
%dir /etc/prometheus/SUSE/default_rules/
|
||||
%config /etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
|
||||
%if 0%{?suse_version}
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/prometheus
|
||||
%endif
|
||||
|
||||
%attr(0755,root,root) %dir %{_sysconfdir}/prometheus/ceph
|
||||
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
||||
|
||||
%changelog
|
||||
# nospeccleaner
|
||||
|
||||
Loading…
Reference in New Issue
Block a user