diff --git a/ceph-14.0.1-1545-g01bead277f.tar.bz2 b/ceph-14.0.1-1545-g01bead277f.tar.bz2 deleted file mode 100644 index b567202..0000000 --- a/ceph-14.0.1-1545-g01bead277f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4fcd0142c5d733ffe9710d63456346dc54360fcdf27587efb6d6ae21ec7e24b9 -size 95394334 diff --git a/ceph-14.0.1-1547-g08fca371b5.tar.bz2 b/ceph-14.0.1-1547-g08fca371b5.tar.bz2 new file mode 100644 index 0000000..3f1234c --- /dev/null +++ b/ceph-14.0.1-1547-g08fca371b5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d532050637645ae6dcacb9e44798c3d6166bc59e0bb5172da3e48ce630bdca96 +size 95388389 diff --git a/ceph-test.changes b/ceph-test.changes index 2724a27..a34ca14 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 3 16:24:29 UTC 2018 - ncutler@suse.com + +- Update to v14.0.1-1547-g08fca371b5: + + mgr/volumes: Fix Python 3 import error + (fixes cluster deployment in py3 environment) + ------------------------------------------------------------------- Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com @@ -12,7 +19,7 @@ Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com ------------------------------------------------------------------- Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com -- spec file: make ceph-common provide/obsolete libradosstriper1 +- spec file: make ceph-common obsolete libradosstriper1 (in SES5 ceph-common requires libradosstriper1 with exact version match, while in SES6 there is no libradosstriper1 at all) diff --git a/ceph-test.spec b/ceph-test.spec index 9f6ee68..8da16e8 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.1.1545+g01bead277f +Version: 14.0.1.1547+g08fca371b5 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1545-g01bead277f.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1547-g08fca371b5.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -468,7 +468,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.0.1-1545-g01bead277f +%autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5 %build @@ -1052,5 +1052,7 @@ rm -rf %{buildroot} %endif # with selinux %if 0%{with python2} %endif +%if 0%{?suse_version} +%endif %changelog # nospeccleaner diff --git a/ceph.changes b/ceph.changes index 2724a27..a34ca14 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 3 16:24:29 UTC 2018 - ncutler@suse.com + +- Update to v14.0.1-1547-g08fca371b5: + + mgr/volumes: Fix Python 3 import error + (fixes cluster deployment in py3 environment) + ------------------------------------------------------------------- Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com @@ -12,7 +19,7 @@ Fri Nov 30 19:09:43 UTC 2018 - ncutler@suse.com ------------------------------------------------------------------- Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com -- spec file: make ceph-common provide/obsolete libradosstriper1 +- spec file: make ceph-common obsolete libradosstriper1 (in SES5 ceph-common requires libradosstriper1 with exact version match, while in SES6 there is no libradosstriper1 at all) diff --git a/ceph.spec b/ceph.spec index 2d916e8..5925b4c 100644 --- a/ceph.spec +++ b/ceph.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.1.1545+g01bead277f +Version: 14.0.1.1547+g08fca371b5 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and Group: System/Filesystems %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1545-g01bead277f.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1547-g08fca371b5.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -391,7 +391,6 @@ Obsoletes: libxio <= 1.7 %if 0%{with libradosstriper} Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} %else -Provides: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} Obsoletes: libradosstriper1 <= %{_epoch_prefix}%{version}-%{release} %endif %{?systemd_requires} @@ -971,7 +970,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.1-1545-g01bead277f +%autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5 %build @@ -2020,9 +2019,13 @@ exit 0 %endif %files grafana-dashboards -%attr(0755,root,root) %dir %{_sysconfdir}/grafana -%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards +%if 0%{?suse_version} +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards +%attr(0750,root,grafana) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard +%else %attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard +%endif %config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/* %doc monitoring/grafana/dashboards/README %doc monitoring/grafana/README.md