From ae6231234e0513436f80d0754ed2f9cc183058050c8a3b63c88c7ce9719e996d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 16 Mar 2018 22:39:53 +0000 Subject: [PATCH] Accepting request 588027 from filesystems:ceph:mimic mimic-dev2 OBS-URL: https://build.opensuse.org/request/show/588027 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=169 --- ceph-13.0.1-2078-g85df538001.tar.bz2 | 3 -- ceph-13.0.1-3023-g71b0480e48.tar.bz2 | 3 ++ ceph-test.changes | 11 +++++++ ceph-test.spec | 34 ++++++++++++---------- ceph.changes | 11 +++++++ ceph.spec | 43 +++++++++++++++------------- 6 files changed, 67 insertions(+), 38 deletions(-) delete mode 100644 ceph-13.0.1-2078-g85df538001.tar.bz2 create mode 100644 ceph-13.0.1-3023-g71b0480e48.tar.bz2 diff --git a/ceph-13.0.1-2078-g85df538001.tar.bz2 b/ceph-13.0.1-2078-g85df538001.tar.bz2 deleted file mode 100644 index d3f6dca..0000000 --- a/ceph-13.0.1-2078-g85df538001.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e22ccefee291cc7d25092e43d481eee996eb7ff68333bd13293841bc4e91203 -size 65966519 diff --git a/ceph-13.0.1-3023-g71b0480e48.tar.bz2 b/ceph-13.0.1-3023-g71b0480e48.tar.bz2 new file mode 100644 index 0000000..926debd --- /dev/null +++ b/ceph-13.0.1-3023-g71b0480e48.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3090f0e647b0c3d62a691752863f2b10de048537509d3f2a38a684216159b92b +size 68267448 diff --git a/ceph-test.changes b/ceph-test.changes index 17c8e6f..a232992 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com + +- Update to 13.0.1-3023-g71b0480e48: + + mimic-dev2 (including notably dashboard_v2 MGR module) + +------------------------------------------------------------------- +Fri Feb 23 12:10:01 UTC 2018 - ncutler@suse.com + +- forward port DeepSea integration suite from ses5 + ------------------------------------------------------------------- Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 03d6e61..93c3bf1 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 13.0.1.2078+g85df538001 +Version: 13.0.1.3023+g71b0480e48 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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-13.0.1-2078-g85df538001.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -228,12 +228,23 @@ BuildRequires: python3-Cython BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage +%if 0%{?fedora} +BuildRequires: python%{_python_buildid}-bcrypt +%endif +%if 0%{?rhel} +BuildRequires: py-bcrypt +%endif %endif %if 0%{?suse_version} BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -282,13 +293,13 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif -%if 0%{?fedora} || 0%{?rhel} -%endif -%if 0%{?suse_version} -%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} +%if 0%{?fedora} +%endif +%if 0%{?rhel} +%endif %endif %if 0%{?suse_version} %endif @@ -397,7 +408,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-13.0.1-2078-g85df538001 +%autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48 %build @@ -460,13 +471,13 @@ cmake .. \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ + -DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \ %if %{with python2} -DWITH_PYTHON2=ON \ %else -DWITH_PYTHON2=OFF \ -DMGR_PYTHON_VERSION=3 \ %endif - -DWITH_SYSTEMD=ON \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif @@ -668,13 +679,8 @@ rm -rf %{buildroot}%{_libdir}/ceph/mgr rm -rf %{buildroot}%{_unitdir}/ceph-mgr@.service rm -rf %{buildroot}%{_unitdir}/ceph-mgr.target rm -rf %{buildroot}%{_bindir}/ceph-mon -rm -rf %{buildroot}%{_bindir}/ceph-rest-api rm -rf %{buildroot}%{_bindir}/ceph-monstore-tool rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8* -rm -rf %{buildroot}%{_mandir}/man8/ceph-rest-api.8* -rm -rf %{buildroot}%{python_sitelib}/ceph_rest_api.py* -rm -rf %{buildroot}%{python3_sitelib}/ceph_rest_api.py -rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_rest_api.cpython*.py* rm -rf %{buildroot}%{_unitdir}/ceph-mon@.service rm -rf %{buildroot}%{_unitdir}/ceph-mon.target rm -rf %{buildroot}%{_bindir}/ceph-fuse @@ -860,8 +866,6 @@ rm -rf %{buildroot} %endif %if 0%{?fedora} || 0%{?rhel} %endif -%if 0%{with python2} -%endif %if 0%{?suse_version} %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/ceph.changes b/ceph.changes index 17c8e6f..a232992 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com + +- Update to 13.0.1-3023-g71b0480e48: + + mimic-dev2 (including notably dashboard_v2 MGR module) + +------------------------------------------------------------------- +Fri Feb 23 12:10:01 UTC 2018 - ncutler@suse.com + +- forward port DeepSea integration suite from ses5 + ------------------------------------------------------------------- Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 9e909e6..3c06778 100644 --- a/ceph.spec +++ b/ceph.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph -Version: 13.0.1.2078+g85df538001 +Version: 13.0.1.3023+g71b0480e48 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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-13.0.1-2078-g85df538001.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -220,12 +220,23 @@ BuildRequires: python3-Cython BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage +%if 0%{?fedora} +BuildRequires: python%{_python_buildid}-bcrypt +%endif +%if 0%{?rhel} +BuildRequires: py-bcrypt +%endif %endif %if 0%{?suse_version} BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -282,7 +293,7 @@ Requires: util-linux Requires: xfsprogs Requires: which %if 0%{?suse_version} -Recommends: ntp-daemon +Recommends: chrony Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif @@ -337,13 +348,6 @@ Summary: Ceph Monitor Daemon Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -# For ceph-rest-api -%if 0%{?fedora} || 0%{?rhel} -Requires: python%{_python_buildid}-flask -%endif -%if 0%{?suse_version} -Requires: python%{_python_buildid}-Flask -%endif %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file system. One or more instances of ceph-mon form a Paxos part-time @@ -362,6 +366,12 @@ Requires: python%{_python_buildid}-jinja2 Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-werkzeug Requires: pyOpenSSL%{_python_buildid} +%if 0%{?fedora} +Requires: python%{_python_buildid}-bcrypt +%endif +%if 0%{?rhel} +Requires: py-bcrypt +%endif %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy @@ -369,6 +379,7 @@ Requires: python%{_python_buildid}-Jinja2 Requires: python%{_python_buildid}-Werkzeug Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-pyOpenSSL +Requires: python%{_python_buildid}-bcrypt Recommends: python%{_python_buildid}-influxdb %endif %description mgr @@ -829,7 +840,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.1-2078-g85df538001 +%autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48 %build @@ -892,13 +903,13 @@ cmake .. \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ -DWITH_PYTHON3=ON \ + -DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \ %if %{with python2} -DWITH_PYTHON2=ON \ %else -DWITH_PYTHON2=OFF \ -DMGR_PYTHON_VERSION=3 \ %endif - -DWITH_SYSTEMD=ON \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif @@ -1324,16 +1335,8 @@ fi %files mon %{_bindir}/ceph-mon -%{_bindir}/ceph-rest-api %{_bindir}/ceph-monstore-tool %{_mandir}/man8/ceph-mon.8* -%{_mandir}/man8/ceph-rest-api.8* -%if 0%{with python2} -%{python_sitelib}/ceph_rest_api.py* -%else -%{python3_sitelib}/ceph_rest_api.py -%{python3_sitelib}/__pycache__/ceph_rest_api.cpython*.py* -%endif %{_unitdir}/ceph-mon@.service %{_unitdir}/ceph-mon.target %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon