From dde985eba75b555db737a657934b61e9cbe4d4e4d3fb2c0553a4ba666e36abf1 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 4 Mar 2019 11:50:56 +0000 Subject: [PATCH] Accepting request 681313 from filesystems:ceph:nautilus fix ceph-mgr-diskprediction-local runtime deps OBS-URL: https://build.opensuse.org/request/show/681313 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=210 --- _constraints | 2 +- ceph-14.1.0-402-ga396e8bf3b.tar.bz2 | 3 - ceph-14.1.0-559-gf1a72cff25.tar.bz2 | 3 + ceph-test.changes | 17 + ceph-test.spec | 222 ++++---- ceph.changes | 17 + ceph.spec | 750 +++++++++++++++------------- 7 files changed, 539 insertions(+), 475 deletions(-) delete mode 100644 ceph-14.1.0-402-ga396e8bf3b.tar.bz2 create mode 100644 ceph-14.1.0-559-gf1a72cff25.tar.bz2 diff --git a/_constraints b/_constraints index 1587125..bb12702 100644 --- a/_constraints +++ b/_constraints @@ -12,7 +12,7 @@ 28 - 8500 + 9000 diff --git a/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 b/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 deleted file mode 100644 index 9729ca5..0000000 --- a/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:704028e97fa4710123d85bce3d6e67c0adb4db2a40c698a45047d32d44cd8656 -size 95818578 diff --git a/ceph-14.1.0-559-gf1a72cff25.tar.bz2 b/ceph-14.1.0-559-gf1a72cff25.tar.bz2 new file mode 100644 index 0000000..9320d8c --- /dev/null +++ b/ceph-14.1.0-559-gf1a72cff25.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b317bc63e1fe86e4db0e77b6613970bd6a495f28f9b01d2e9edd2189904df81 +size 96538856 diff --git a/ceph-test.changes b/ceph-test.changes index bd44aaa..0df4ad1 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com + +- Edge ceph package memory constraint upward to address "virtual memory + exhausted: Cannot allocate memory" build failure sseen in OBS + +------------------------------------------------------------------- +Fri Mar 1 14:51:10 UTC 2019 - ncutler@suse.com + +- Update to 14.1.0-559-gf1a72cff25: + + rebase on top of upstream master branch, SHA1 34f04be35bb9abcb5860b4c975b105adacc7a3aa + * fix GCC-9 build (bsc#1121395) + + SUSE branding for Ceph Dashboard (Sebastian Krah) + + spec: + * Drop use of $FIRST_ARG (Franck Bui) + * fix ceph-mgr-diskprediction-local runtime deps + ------------------------------------------------------------------- Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index a926ea3..839bcd3 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -1,25 +1,24 @@ # # spec file for package ceph # +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file # at the top-level directory of this distribution and at # https://github.com/ceph/ceph/blob/master/COPYING # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -# upon. -# -# This file is under the GNU Lesser General Public License, version 2.1 -# -# Please submit bugfixes or comments via http://tracker.ceph.com/ +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -################################################################################# -# conditional build section -# -# please read http://rpm.org/user_doc/conditional_builds.html for explanation of -# bcond syntax! -################################################################################# + %bcond_without ocf %bcond_with make_check %ifarch s390 s390x @@ -97,23 +96,22 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.1.0.402+ga396e8bf3b +Version: 14.1.0.559+gf1a72cff25 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} -Epoch: 2 %endif # define _epoch_prefix macro which will expand to the empty string if epoch is # undefined -%global _epoch_prefix %{?epoch:%{epoch}:} +%global _epoch_prefix %{?epoch:} Summary: Ceph benchmarks and test tools -License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT -%if 0%{?suse_version} +License: LGPL-2.1-only AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND BSD-3-Clause AND MIT Group: System/Filesystems +%if 0%{?suse_version} %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.1.0-402-ga396e8bf3b.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.1.0-559-gf1a72cff25.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -130,89 +128,88 @@ ExclusiveArch: x86_64 aarch64 ppc64le Requires: ceph-common -Requires: xmlstarlet Requires: jq Requires: socat +Requires: xmlstarlet Requires(post): binutils %if 0%{with cephfs_java} -BuildRequires: java-devel -BuildRequires: sharutils +BuildRequires: java-devel +BuildRequires: sharutils %endif %if 0%{with selinux} -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel %endif -BuildRequires: gperf +BuildRequires: gperf %if 0%{?rhel} == 7 BuildRequires: cmake3 > 3.5 %else BuildRequires: cmake > 3.5 %endif -BuildRequires: cryptsetup -BuildRequires: fuse-devel +BuildRequires: cryptsetup +BuildRequires: fuse-devel %if 0%{?rhel} == 7 # devtoolset offers newer make and valgrind-devel, but the old ones are good # enough. -BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13 +BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13 %else -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ %endif -BuildRequires: gdbm +BuildRequires: gdbm %if 0%{with tcmalloc} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: gperftools-devel >= 2.6.1 +BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} -BuildRequires: gperftools-devel >= 2.4 +BuildRequires: gperftools-devel >= 2.4 %endif %endif -BuildRequires: leveldb-devel > 1.2 -BuildRequires: libaio-devel -BuildRequires: libblkid-devel >= 2.17 -BuildRequires: libcurl-devel -BuildRequires: libudev-devel -BuildRequires: liboath-devel -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: libuuid-devel -BuildRequires: make -BuildRequires: ncurses-devel -BuildRequires: parted -BuildRequires: perl -BuildRequires: pkgconfig +BuildRequires: leveldb-devel > 1.2 +BuildRequires: libaio-devel +BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libcurl-devel +BuildRequires: liboath-devel +BuildRequires: libtool +BuildRequires: libudev-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: parted +BuildRequires: perl +BuildRequires: pkgconfig BuildRequires: procps -BuildRequires: python%{_python_buildid} -BuildRequires: python%{_python_buildid}-devel -BuildRequires: snappy-devel -BuildRequires: sudo -BuildRequires: udev -BuildRequires: util-linux -BuildRequires: valgrind-devel -BuildRequires: which -BuildRequires: xfsprogs -BuildRequires: xfsprogs-devel -BuildRequires: xmlstarlet -BuildRequires: yasm +BuildRequires: python%{_python_buildid} +BuildRequires: python%{_python_buildid}-devel +BuildRequires: snappy-devel +BuildRequires: sudo +BuildRequires: udev +BuildRequires: util-linux +BuildRequires: valgrind-devel +BuildRequires: which +BuildRequires: xfsprogs +BuildRequires: xfsprogs-devel +BuildRequires: xmlstarlet +BuildRequires: yasm %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel %endif %if 0%{with make_check} BuildRequires: jq -BuildRequires: python%{_python_buildid}-bcrypt -BuildRequires: python%{_python_buildid}-coverage -BuildRequires: python%{_python_buildid}-nose -BuildRequires: python%{_python_buildid}-pecan -BuildRequires: python%{_python_buildid}-requests -BuildRequires: python%{_python_buildid}-six -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-virtualenv -%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-coverage +BuildRequires: python%{_python_buildid}-nose +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-requests +BuildRequires: python%{_python_buildid}-six +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-virtualenv +%if 0%{?rhel} == 7 BuildRequires: pyOpenSSL%{_python_buildid} -%endif -%if 0%{?suse_version} +%else BuildRequires: python%{_python_buildid}-pyOpenSSL %endif -BuildRequires: socat +BuildRequires: socat %endif %if 0%{with seastar} BuildRequires: c-ares-devel @@ -229,88 +226,88 @@ BuildRequires: yaml-cpp-devel # distro-conditional dependencies ################################################################################# %if 0%{?suse_version} +BuildRequires: systemd +BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(systemd) -BuildRequires: systemd-rpm-macros -BuildRequires: systemd %{?systemd_requires} -PreReq: %fillup_prereq -BuildRequires: net-tools -BuildRequires: libbz2-devel -BuildRequires: mozilla-nss-devel -BuildRequires: keyutils-devel +PreReq: %fillup_prereq +BuildRequires: keyutils-devel +BuildRequires: libbz2-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release +BuildRequires: mozilla-nss-devel +BuildRequires: net-tools BuildRequires: openldap2-devel #BuildRequires: krb5 #BuildRequires: krb5-devel BuildRequires: cunit-devel -BuildRequires: python%{_python_buildid}-setuptools -BuildRequires: python%{_python_buildid}-Cython -BuildRequires: python%{_python_buildid}-PrettyTable -BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: liblz4-devel >= 1.7 +BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-PrettyTable +BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-setuptools BuildRequires: rdma-core-devel -BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} BuildRequires: boost-random -BuildRequires: nss-devel -BuildRequires: keyutils-libs-devel -BuildRequires: libibverbs-devel +BuildRequires: keyutils-libs-devel +BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel +BuildRequires: nss-devel BuildRequires: openldap-devel #BuildRequires: krb5-devel -BuildRequires: openssl-devel BuildRequires: CUnit-devel +BuildRequires: openssl-devel BuildRequires: redhat-lsb-core %if 0%{?rhel} == 7 -BuildRequires: Cython -BuildRequires: python34-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: Cython +BuildRequires: python34-Cython +BuildRequires: python34-devel +BuildRequires: python34-setuptools %else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-setuptools %endif -BuildRequires: python%{_python_buildid}-prettytable -BuildRequires: python%{_python_buildid}-sphinx -BuildRequires: lz4-devel >= 1.7 +BuildRequires: lz4-devel >= 1.7 +BuildRequires: python%{_python_buildid}-prettytable +BuildRequires: python%{_python_buildid}-sphinx %endif # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: python%{_python_buildid}-cherrypy -BuildRequires: python%{_python_buildid}-jwt -BuildRequires: python%{_python_buildid}-routes -BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-cherrypy +BuildRequires: python%{_python_buildid}-jwt +BuildRequires: python%{_python_buildid}-routes +BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 %endif %if 0%{?suse_version} -BuildRequires: python%{_python_buildid}-CherryPy -BuildRequires: python%{_python_buildid}-PyJWT -BuildRequires: python%{_python_buildid}-Routes -BuildRequires: python%{_python_buildid}-Werkzeug -BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-CherryPy +BuildRequires: python%{_python_buildid}-PyJWT +BuildRequires: python%{_python_buildid}-Routes +BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: xmlsec1-devel %endif %endif # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lttng-ust-devel -BuildRequires: libbabeltrace-devel +BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-devel %endif %if 0%{?suse_version} -BuildRequires: lttng-ust-devel BuildRequires: babeltrace-devel +BuildRequires: lttng-ust-devel %endif %endif %if 0%{?suse_version} -BuildRequires: libexpat-devel +BuildRequires: libexpat-devel %endif %if 0%{?rhel} || 0%{?fedora} -BuildRequires: expat-devel +BuildRequires: expat-devel %endif #hardened-cc1 %if 0%{?fedora} || 0%{?rhel} @@ -376,6 +373,10 @@ 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%{?suse_version} @@ -491,7 +492,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b +%autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25 %build @@ -609,7 +610,6 @@ ${CMAKE} .. \ make "$CEPH_MFLAGS_JOBS" - %if 0%{with make_check} %check # run in-tree unittests @@ -617,7 +617,6 @@ cd build ctest "$CEPH_MFLAGS_JOBS" %endif - %install pushd build make DESTDIR=%{buildroot} install @@ -1108,4 +1107,3 @@ rm -rf %{buildroot} %if 0%{?suse_version} %endif %changelog -# nospeccleaner diff --git a/ceph.changes b/ceph.changes index bd44aaa..0df4ad1 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com + +- Edge ceph package memory constraint upward to address "virtual memory + exhausted: Cannot allocate memory" build failure sseen in OBS + +------------------------------------------------------------------- +Fri Mar 1 14:51:10 UTC 2019 - ncutler@suse.com + +- Update to 14.1.0-559-gf1a72cff25: + + rebase on top of upstream master branch, SHA1 34f04be35bb9abcb5860b4c975b105adacc7a3aa + * fix GCC-9 build (bsc#1121395) + + SUSE branding for Ceph Dashboard (Sebastian Krah) + + spec: + * Drop use of $FIRST_ARG (Franck Bui) + * fix ceph-mgr-diskprediction-local runtime deps + ------------------------------------------------------------------- Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 5a254c4..eee0d45 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,25 +1,24 @@ # # spec file for package ceph # +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file # at the top-level directory of this distribution and at # https://github.com/ceph/ceph/blob/master/COPYING # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -# upon. -# -# This file is under the GNU Lesser General Public License, version 2.1 -# -# Please submit bugfixes or comments via http://tracker.ceph.com/ +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -################################################################################# -# conditional build section -# -# please read http://rpm.org/user_doc/conditional_builds.html for explanation of -# bcond syntax! -################################################################################# + %bcond_without ocf %bcond_with make_check %ifarch s390 s390x @@ -96,24 +95,23 @@ ################################################################################# # main package definition ################################################################################# -Name: ceph -Version: 14.1.0.402+ga396e8bf3b -Release: 0%{?dist} +Name: ceph +Version: 14.1.0.559+gf1a72cff25 +Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} -Epoch: 2 %endif # define _epoch_prefix macro which will expand to the empty string if epoch is # undefined -%global _epoch_prefix %{?epoch:%{epoch}:} +%global _epoch_prefix %{?epoch:} -Summary: User space components of the Ceph file system -License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT +Summary: User space components of the Ceph file system +License: LGPL-2.1-only AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND BSD-3-Clause AND MIT +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.1.0-402-ga396e8bf3b.tar.bz2 +URL: http://ceph.com/ +Source0: %{?_remote_tarball_prefix}ceph-14.1.0-559-gf1a72cff25.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -121,90 +119,89 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x ################################################################################# # dependencies that apply across all distro families ################################################################################# -Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release} Requires(post): binutils %if 0%{with cephfs_java} -BuildRequires: java-devel -BuildRequires: sharutils +BuildRequires: java-devel +BuildRequires: sharutils %endif %if 0%{with selinux} -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel %endif -BuildRequires: gperf +BuildRequires: gperf %if 0%{?rhel} == 7 BuildRequires: cmake3 > 3.5 %else BuildRequires: cmake > 3.5 %endif -BuildRequires: cryptsetup -BuildRequires: fuse-devel +BuildRequires: cryptsetup +BuildRequires: fuse-devel %if 0%{?rhel} == 7 # devtoolset offers newer make and valgrind-devel, but the old ones are good # enough. -BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13 +BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13 %else -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ %endif -BuildRequires: gdbm +BuildRequires: gdbm %if 0%{with tcmalloc} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: gperftools-devel >= 2.6.1 +BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} -BuildRequires: gperftools-devel >= 2.4 +BuildRequires: gperftools-devel >= 2.4 %endif %endif -BuildRequires: leveldb-devel > 1.2 -BuildRequires: libaio-devel -BuildRequires: libblkid-devel >= 2.17 -BuildRequires: libcurl-devel -BuildRequires: libudev-devel -BuildRequires: liboath-devel -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: libuuid-devel -BuildRequires: make -BuildRequires: ncurses-devel -BuildRequires: parted -BuildRequires: perl -BuildRequires: pkgconfig +BuildRequires: leveldb-devel > 1.2 +BuildRequires: libaio-devel +BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libcurl-devel +BuildRequires: liboath-devel +BuildRequires: libtool +BuildRequires: libudev-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: parted +BuildRequires: perl +BuildRequires: pkgconfig BuildRequires: procps -BuildRequires: python%{_python_buildid} -BuildRequires: python%{_python_buildid}-devel -BuildRequires: snappy-devel -BuildRequires: sudo -BuildRequires: udev -BuildRequires: util-linux -BuildRequires: valgrind-devel -BuildRequires: which -BuildRequires: xfsprogs -BuildRequires: xfsprogs-devel -BuildRequires: xmlstarlet -BuildRequires: yasm +BuildRequires: python%{_python_buildid} +BuildRequires: python%{_python_buildid}-devel +BuildRequires: snappy-devel +BuildRequires: sudo +BuildRequires: udev +BuildRequires: util-linux +BuildRequires: valgrind-devel +BuildRequires: which +BuildRequires: xfsprogs +BuildRequires: xfsprogs-devel +BuildRequires: xmlstarlet +BuildRequires: yasm %if 0%{with amqp_endpoint} BuildRequires: librabbitmq-devel %endif %if 0%{with make_check} BuildRequires: jq -BuildRequires: python%{_python_buildid}-bcrypt -BuildRequires: python%{_python_buildid}-coverage -BuildRequires: python%{_python_buildid}-nose -BuildRequires: python%{_python_buildid}-pecan -BuildRequires: python%{_python_buildid}-requests -BuildRequires: python%{_python_buildid}-six -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-virtualenv -%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-coverage +BuildRequires: python%{_python_buildid}-nose +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-requests +BuildRequires: python%{_python_buildid}-six +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-virtualenv +%if 0%{?rhel} == 7 BuildRequires: pyOpenSSL%{_python_buildid} -%endif -%if 0%{?suse_version} +%else BuildRequires: python%{_python_buildid}-pyOpenSSL %endif -BuildRequires: socat +BuildRequires: socat %endif %if 0%{with seastar} BuildRequires: c-ares-devel @@ -221,88 +218,88 @@ BuildRequires: yaml-cpp-devel # distro-conditional dependencies ################################################################################# %if 0%{?suse_version} +BuildRequires: systemd +BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(systemd) -BuildRequires: systemd-rpm-macros -BuildRequires: systemd %{?systemd_requires} -PreReq: %fillup_prereq -BuildRequires: net-tools -BuildRequires: libbz2-devel -BuildRequires: mozilla-nss-devel -BuildRequires: keyutils-devel +PreReq: %fillup_prereq +BuildRequires: keyutils-devel +BuildRequires: libbz2-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release +BuildRequires: mozilla-nss-devel +BuildRequires: net-tools BuildRequires: openldap2-devel #BuildRequires: krb5 #BuildRequires: krb5-devel BuildRequires: cunit-devel -BuildRequires: python%{_python_buildid}-setuptools -BuildRequires: python%{_python_buildid}-Cython -BuildRequires: python%{_python_buildid}-PrettyTable -BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: liblz4-devel >= 1.7 +BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-PrettyTable +BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-setuptools BuildRequires: rdma-core-devel -BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} -Requires: systemd +Requires: systemd BuildRequires: boost-random -BuildRequires: nss-devel -BuildRequires: keyutils-libs-devel -BuildRequires: libibverbs-devel +BuildRequires: keyutils-libs-devel +BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel +BuildRequires: nss-devel BuildRequires: openldap-devel #BuildRequires: krb5-devel -BuildRequires: openssl-devel BuildRequires: CUnit-devel +BuildRequires: openssl-devel BuildRequires: redhat-lsb-core %if 0%{?rhel} == 7 -BuildRequires: Cython -BuildRequires: python34-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: Cython +BuildRequires: python34-Cython +BuildRequires: python34-devel +BuildRequires: python34-setuptools %else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-setuptools %endif -BuildRequires: python%{_python_buildid}-prettytable -BuildRequires: python%{_python_buildid}-sphinx -BuildRequires: lz4-devel >= 1.7 +BuildRequires: lz4-devel >= 1.7 +BuildRequires: python%{_python_buildid}-prettytable +BuildRequires: python%{_python_buildid}-sphinx %endif # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: python%{_python_buildid}-cherrypy -BuildRequires: python%{_python_buildid}-jwt -BuildRequires: python%{_python_buildid}-routes -BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-cherrypy +BuildRequires: python%{_python_buildid}-jwt +BuildRequires: python%{_python_buildid}-routes +BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 %endif %if 0%{?suse_version} -BuildRequires: python%{_python_buildid}-CherryPy -BuildRequires: python%{_python_buildid}-PyJWT -BuildRequires: python%{_python_buildid}-Routes -BuildRequires: python%{_python_buildid}-Werkzeug -BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-CherryPy +BuildRequires: python%{_python_buildid}-PyJWT +BuildRequires: python%{_python_buildid}-Routes +BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: xmlsec1-devel %endif %endif # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lttng-ust-devel -BuildRequires: libbabeltrace-devel +BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-devel %endif %if 0%{?suse_version} -BuildRequires: lttng-ust-devel BuildRequires: babeltrace-devel +BuildRequires: lttng-ust-devel %endif %endif %if 0%{?suse_version} -BuildRequires: libexpat-devel +BuildRequires: libexpat-devel %endif %if 0%{?rhel} || 0%{?fedora} -BuildRequires: expat-devel +BuildRequires: expat-devel %endif #hardened-cc1 %if 0%{?fedora} || 0%{?rhel} @@ -329,64 +326,64 @@ on commodity hardware and delivers object, block and file system storage. # subpackages ################################################################################# %package base -Summary: Ceph Base Package +Summary: Ceph Base Package +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Provides: ceph-test:/usr/bin/ceph-kvstore-tool -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Provides: ceph-test:/usr/bin/ceph-kvstore-tool +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} -Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif -Requires: cryptsetup -Requires: e2fsprogs -Requires: findutils -Requires: grep -Requires: logrotate -Requires: parted -Requires: psmisc -Requires: python%{_python_buildid}-requests -Requires: python%{_python_buildid}-setuptools -Requires: util-linux -Requires: xfsprogs -Requires: which +Requires: cryptsetup +Requires: e2fsprogs +Requires: findutils +Requires: grep +Requires: logrotate +Requires: parted +Requires: psmisc +Requires: python%{_python_buildid}-requests +Requires: python%{_python_buildid}-setuptools +Requires: util-linux +Requires: which +Requires: xfsprogs %if 0%{?fedora} || 0%{?rhel} # The following is necessary due to tracker 36508 and can be removed once the # associated upstream bugs are resolved. %if 0%{with tcmalloc} -Requires: gperftools-libs >= 2.6.1 +Requires: gperftools-libs >= 2.6.1 %endif %endif %if 0%{?suse_version} -Recommends: chrony -Requires: gptfdisk +Recommends: chrony +Requires: gptfdisk %endif %description base Base is the package that includes all the files shared amongst ceph servers %package -n ceph-common -Summary: Ceph Common +Summary: Ceph Common +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-requests +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-requests +Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} -Requires: python%{_python_buildid}-prettytable +Requires: python%{_python_buildid}-prettytable %endif %if 0%{?suse_version} -Requires: python%{_python_buildid}-PrettyTable +Requires: python%{_python_buildid}-PrettyTable Obsoletes: libxio <= 1.7 %endif %if 0%{with libradosstriper} @@ -404,23 +401,25 @@ Common utilities to mount and interact with a ceph storage cluster. Comprised of files that are common to Ceph clients and servers. %package mds -Summary: Ceph Metadata Server Daemon +Summary: Ceph Metadata Server Daemon +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} + %description mds ceph-mds is the metadata server daemon for the Ceph distributed file system. One or more instances of ceph-mds collectively manage the file system namespace, coordinating access to the shared OSD cluster. %package mon -Summary: Ceph Monitor Daemon +Summary: Ceph Monitor Daemon +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Provides: ceph-test:/usr/bin/ceph-monstore-tool -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Provides: ceph-test:/usr/bin/ceph-monstore-tool +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} + %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 @@ -429,8 +428,8 @@ of cluster membership, configuration, and state. %package mgr Summary: Ceph Manager Daemon -%if 0%{?suse_version} Group: System/Filesystems +%if 0%{?suse_version} %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-bcrypt @@ -444,11 +443,11 @@ Requires: python%{_python_buildid}-werkzeug Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-Werkzeug Recommends: python%{_python_buildid}-influxdb -Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} -Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} +Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release} %endif %if 0%{?rhel} == 7 Requires: pyOpenSSL @@ -463,9 +462,9 @@ exposes all these to the python modules. %package mgr-dashboard Summary: Ceph Dashboard +Group: System/Filesystems BuildArch: noarch %if 0%{?suse_version} -Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} @@ -493,24 +492,31 @@ detailed feature overview. %package mgr-diskprediction-local Summary: ceph-mgr diskprediction_local plugin +Group: System/Filesystems BuildArch: noarch %if 0%{?suse_version} -Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} Requires: numpy Requires: scipy +%endif +%if 0%{?suse_version} +Requires: python%{_python_buildid}-numpy +Requires: python%{_python_buildid}-scipy +%endif %description mgr-diskprediction-local ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict disk failures using local algorithms and machine-learning databases. %package mgr-diskprediction-cloud Summary: ceph-mgr diskprediction_cloud plugin +Group: System/Filesystems BuildArch: noarch %if 0%{?suse_version} -Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} + %description mgr-diskprediction-cloud ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict disk failures using services in the Google cloud. @@ -518,81 +524,88 @@ disk failures using services in the Google cloud. %package mgr-rook BuildArch: noarch Summary: ceph-mgr rook plugin -%if 0%{?suse_version} Group: System/Filesystems +%if 0%{?suse_version} %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-kubernetes + %description mgr-rook ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using a Rook backend. %package mgr-ssh Summary: ceph-mgr ssh module -BuildArch: noarch -%if 0%{?suse_version} Group: System/Filesystems +BuildArch: noarch +%if 0%{?suse_version} %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-remoto + %description mgr-ssh ceph-mgr-ssh is a ceph-mgr module for orchestration functions using direct SSH connections for management operations. %package fuse -Summary: Ceph fuse-based client +Summary: Ceph fuse-based client +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif Requires: fuse -Requires: python%{python3_pkgversion} +Requires: python%{python3_pkgversion} + %description fuse FUSE based client for Ceph distributed network file system %package -n rbd-fuse -Summary: Ceph fuse-based client +Summary: Ceph fuse-based client +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} + %description -n rbd-fuse FUSE based client to map Ceph rbd images to files %package -n rbd-mirror -Summary: Ceph daemon for mirroring RBD images +Summary: Ceph daemon for mirroring RBD images +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} + %description -n rbd-mirror Daemon for mirroring RBD images between Ceph clusters, streaming changes asynchronously. %package -n rbd-nbd -Summary: Ceph RBD client base on NBD +Summary: Ceph RBD client base on NBD +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} + %description -n rbd-nbd NBD based client to map Ceph rbd images to local device %package radosgw -Summary: Rados REST gateway +Summary: Rados REST gateway +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} -Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} -Requires: mailcap +Requires: mailcap %endif %description radosgw RADOS is a distributed object store used by the Ceph distributed @@ -602,12 +615,13 @@ service as well as the OpenStack Object Storage ("Swift") API. %if %{with ocf} %package resource-agents -Summary: OCF-compliant resource agents for Ceph daemons +Summary: OCF-compliant resource agents for Ceph daemons +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version} -Requires: resource-agents +Requires: ceph-base = %{_epoch_prefix}%{version} +Requires: resource-agents + %description resource-agents Resource agents for monitoring and managing Ceph daemons under Open Cluster Framework (OCF) compliant resource @@ -615,26 +629,27 @@ managers such as Pacemaker. %endif %package osd -Summary: Ceph Object Storage Daemon +Summary: Ceph Object Storage Daemon +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Provides: ceph-test:/usr/bin/ceph-osdomap-tool -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: lvm2 -Requires: sudo +Provides: ceph-test:/usr/bin/ceph-osdomap-tool +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: lvm2 +Requires: sudo + %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 and providing access to them over the network. %package -n librados2 -Summary: RADOS distributed object store client library +Summary: RADOS distributed object store client library +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -643,140 +658,150 @@ shared library allowing applications to access the distributed object store using a simple file-like interface. %package -n librados-devel -Summary: RADOS headers +Summary: RADOS headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release} + %description -n librados-devel This package contains C libraries and headers needed to develop programs that use RADOS object store. %package -n libradospp-devel -Summary: RADOS headers +Summary: RADOS headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} + %description -n libradospp-devel This package contains C++ libraries and headers needed to develop programs that use RADOS object store. %package -n librgw2 -Summary: RADOS gateway client library +Summary: RADOS gateway client library +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} + %description -n librgw2 This package provides a library implementation of the RADOS gateway (distributed object store with S3 and Swift personalities). %package -n librgw-devel -Summary: RADOS gateway client library +Summary: RADOS gateway client library +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Provides: librgw2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Provides: librgw2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release} + %description -n librgw-devel This package contains libraries and headers needed to develop programs that use RADOS gateway client library. %if 0%{with python2} %package -n python-rgw -Summary: Python 2 libraries for the RADOS gateway +Summary: Python 2 libraries for the RADOS gateway +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} + %description -n python-rgw This package contains Python 2 libraries for interacting with Cephs RADOS gateway. %endif %package -n python%{python3_pkgversion}-rgw -Summary: Python 3 libraries for the RADOS gateway +Summary: Python 3 libraries for the RADOS gateway +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} + %description -n python%{python3_pkgversion}-rgw This package contains Python 3 libraries for interacting with Cephs RADOS gateway. %if 0%{with python2} %package -n python-rados -Summary: Python 2 libraries for the RADOS object store +Summary: Python 2 libraries for the RADOS object store +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} + %description -n python-rados This package contains Python 2 libraries for interacting with Cephs RADOS object store. %endif %package -n python%{python3_pkgversion}-rados -Summary: Python 3 libraries for the RADOS object store +Summary: Python 3 libraries for the RADOS object store +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: python%{python3_pkgversion} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion} + %description -n python%{python3_pkgversion}-rados This package contains Python 3 libraries for interacting with Cephs RADOS object store. %if 0%{with libradosstriper} %package -n libradosstriper1 -Summary: RADOS striping interface +Summary: RADOS striping interface +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} + %description -n libradosstriper1 Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using an interface very similar to the rados one. %package -n libradosstriper-devel -Summary: RADOS striping interface headers +Summary: RADOS striping interface headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} +Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release} + %description -n libradosstriper-devel This package contains libraries and headers needed to develop programs that use RADOS striping interface. %endif %package -n librbd1 -Summary: RADOS block device client library +Summary: RADOS block device client library +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires(post): coreutils %endif %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -785,54 +810,57 @@ developed as part of the Ceph distributed storage system. This is a shared library allowing applications to manage these block devices. %package -n librbd-devel -Summary: RADOS block device headers +Summary: RADOS block device headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: librbd1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: librbd1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release} + %description -n librbd-devel This package contains libraries and headers needed to develop programs that use RADOS block device. %if 0%{with python2} %package -n python-rbd -Summary: Python 2 libraries for the RADOS block device +Summary: Python 2 libraries for the RADOS block device +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} + %description -n python-rbd This package contains Python 2 libraries for interacting with Cephs RADOS block device. %endif %package -n python%{python3_pkgversion}-rbd -Summary: Python 3 libraries for the RADOS block device +Summary: Python 3 libraries for the RADOS block device +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} + %description -n python%{python3_pkgversion}-rbd This package contains Python 3 libraries for interacting with Cephs RADOS block device. %package -n libcephfs2 -Summary: Ceph distributed file system client library +Summary: Ceph distributed file system client library +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Obsoletes: libcephfs1 +Obsoletes: libcephfs1 %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-libcephfs +Obsoletes: ceph-libcephfs +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n libcephfs2 Ceph is a distributed network file system designed to provide excellent @@ -841,51 +869,54 @@ allowing applications to access a Ceph distributed file system via a POSIX-like interface. %package -n libcephfs-devel -Summary: Ceph distributed file system headers +Summary: Ceph distributed file system headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release} + %description -n libcephfs-devel This package contains libraries and headers needed to develop programs that use Cephs distributed file system. %if 0%{with python2} %package -n python-cephfs -Summary: Python 2 libraries for Ceph distributed file system +Summary: Python 2 libraries for Ceph distributed file system +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python-ceph-argparse = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: python-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} + %description -n python-cephfs This package contains Python 2 libraries for interacting with Cephs distributed file system. %endif %package -n python%{python3_pkgversion}-cephfs -Summary: Python 3 libraries for Ceph distributed file system +Summary: Python 3 libraries for Ceph distributed file system +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} + %description -n python%{python3_pkgversion}-cephfs This package contains Python 3 libraries for interacting with Cephs distributed file system. %if 0%{with python2} %package -n python-ceph-argparse -Summary: Python 2 utility libraries for Ceph CLI +Summary: Python 2 utility libraries for Ceph CLI +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif %description -n python-ceph-argparse This package contains types and routines for Python 2 used by the Ceph CLI as @@ -895,9 +926,9 @@ descriptions, and submitting the command to the appropriate daemon. %endif %package -n python%{python3_pkgversion}-ceph-argparse -Summary: Python 3 utility libraries for Ceph CLI +Summary: Python 3 utility libraries for Ceph CLI +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif %description -n python%{python3_pkgversion}-ceph-argparse This package contains types and routines for Python 3 used by the Ceph CLI as @@ -907,10 +938,12 @@ descriptions, and submitting the command to the appropriate daemon. %if 0%{with cephfs_shell} %package -n cephfs-shell -Summary: Interactive shell for Ceph file system -Requires: python%{python3_pkgversion}-cmd2 -Requires: python%{python3_pkgversion}-colorama -Requires: python%{python3_pkgversion}-cephfs +Summary: Interactive shell for Ceph file system +Group: System/Filesystems +Requires: python%{python3_pkgversion}-cephfs +Requires: python%{python3_pkgversion}-cmd2 +Requires: python%{python3_pkgversion}-colorama + %description -n cephfs-shell This package contains an interactive tool that allows accessing a Ceph file system without mounting it by providing a nice pseudo-shell which @@ -919,14 +952,15 @@ works like an FTP client. %if 0%{with ceph_test_package} %package -n ceph-test -Summary: Ceph benchmarks and test tools +Summary: Ceph benchmarks and test tools +Group: System/Benchmark %if 0%{?suse_version} -Group: System/Benchmark %endif -Requires: ceph-common -Requires: xmlstarlet -Requires: jq -Requires: socat +Requires: ceph-common +Requires: jq +Requires: socat +Requires: xmlstarlet + %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -934,39 +968,42 @@ This package contains Ceph benchmarks and test tools. %if 0%{with cephfs_java} %package -n libcephfs_jni1 -Summary: Java Native Interface library for CephFS Java bindings +Summary: Java Native Interface library for CephFS Java bindings +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: java -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: java +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} + %description -n libcephfs_jni1 This package contains the Java Native Interface library for CephFS Java bindings. %package -n libcephfs_jni-devel -Summary: Development files for CephFS Java Native Interface library +Summary: Development files for CephFS Java Native Interface library +Group: Development/Libraries/Java %if 0%{?suse_version} -Group: Development/Libraries/Java %endif -Requires: java -Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libcephfs_jni1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libcephfs_jni1-devel < %{_epoch_prefix}%{version}-%{release} +Requires: java +Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libcephfs_jni1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libcephfs_jni1-devel < %{_epoch_prefix}%{version}-%{release} + %description -n libcephfs_jni-devel This package contains the development files for CephFS Java Native Interface library. %package -n cephfs-java -Summary: Java libraries for the Ceph File System +Summary: Java libraries for the Ceph File System +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: java -Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} +Requires: java Requires: junit +Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} BuildRequires: junit + %description -n cephfs-java This package contains the Java libraries for the Ceph File System. @@ -974,10 +1011,11 @@ This package contains the Java libraries for the Ceph File System. %package -n rados-objclass-devel Summary: RADOS object class development kit +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} + %description -n rados-objclass-devel This package contains libraries and headers needed to develop RADOS object class plugins. @@ -985,15 +1023,17 @@ class plugins. %if 0%{with selinux} %package selinux -Summary: SELinux support for Ceph MON, OSD and MDS +Summary: SELinux support for Ceph MON, OSD and MDS +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: policycoreutils, libselinux-utils +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: libselinux-utils +Requires: policycoreutils Requires(post): ceph-base = %{_epoch_prefix}%{version}-%{release} Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk Requires(postun): policycoreutils + %description selinux This package contains SELinux support for Ceph MON, OSD and MDS. The package also performs file-system relabelling which can take a long time on heavily @@ -1003,16 +1043,17 @@ populated file-systems. %if 0%{with python2} %package -n python-ceph-compat -Summary: Compatibility package for Cephs python libraries +Summary: Compatibility package for Cephs python libraries +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Obsoletes: python-ceph -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} -Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} -Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} -Provides: python-ceph +Obsoletes: python-ceph +Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} +Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} +Provides: python-ceph + %description -n python-ceph-compat This is a compatibility package to accommodate python-ceph split into python-rados, python-rbd, python-rgw and python-cephfs. Packages still @@ -1021,10 +1062,10 @@ python-rbd, python-rgw or python-cephfs instead. %endif %package grafana-dashboards -Summary: The set of Grafana dashboards for monitoring purposes -BuildArch: noarch +Summary: The set of Grafana dashboards for monitoring purposes +Group: System/Filesystems +BuildArch: noarch %if 0%{?suse_version} -Group: System/Filesystems %endif %description grafana-dashboards This package provides a set of Grafana dashboards for monitoring of @@ -1037,7 +1078,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b +%autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25 %build @@ -1155,7 +1196,6 @@ ${CMAKE} .. \ make "$CEPH_MFLAGS_JOBS" - %if 0%{with make_check} %check # run in-tree unittests @@ -1163,7 +1203,6 @@ cd build ctest "$CEPH_MFLAGS_JOBS" %endif - %install pushd build make DESTDIR=%{buildroot} install @@ -1325,7 +1364,6 @@ fi %postun base /sbin/ldconfig -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph.target @@ -1333,7 +1371,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1462,7 +1500,6 @@ fi %endif %postun mds -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mds@\*.service ceph-mds.target @@ -1470,7 +1507,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mds@\*.service ceph-mds.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1537,7 +1574,6 @@ fi %endif %postun mgr -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mgr@\*.service ceph-mgr.target @@ -1545,7 +1581,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mgr@\*.service ceph-mgr.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1652,7 +1688,6 @@ fi %endif %postun mon -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-mon@\*.service ceph-mon.target @@ -1660,7 +1695,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-mon@\*.service ceph-mon.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1711,7 +1746,6 @@ fi %endif %postun -n rbd-mirror -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target @@ -1719,7 +1753,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1767,7 +1801,6 @@ fi %endif %postun radosgw -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-radosgw@\*.service ceph-radosgw.target @@ -1775,7 +1808,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-radosgw@\*.service ceph-radosgw.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -1835,7 +1868,6 @@ fi %endif %postun osd -test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?suse_version} DISABLE_RESTART_ON_UPDATE="yes" %service_del_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target @@ -1843,7 +1875,7 @@ DISABLE_RESTART_ON_UPDATE="yes" %if 0%{?fedora} || 0%{?rhel} %systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target %endif -if [ $FIRST_ARG -ge 1 ] ; then +if [ $1 -ge 1 ] ; then # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to # "yes". In any case: if units are not running, do not touch them. SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph @@ -2182,6 +2214,6 @@ exit 0 %doc monitoring/grafana/dashboards/README %doc monitoring/grafana/README.md +# nospeccleaner %changelog -# nospeccleaner