Accepting request 644681 from filesystems:ceph:nautilus

migrate to upstream Nautilus codestream

OBS-URL: https://build.opensuse.org/request/show/644681
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=192

ceph-13.2.0-210-g0e990e900d.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21c63800efc380a806f061bf72f5e8ba374140a876fc40f07e8322ebdddfc5b2
-size 72268604

ceph-14.0.0-4389-g4c34d15e48.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00a76313cd051d9a011a66b43c439f182139c6ccf242c6e6148bbf67441f39b9
+size 89814480

ceph-test.changes

@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Thu Oct 25 09:17:58 UTC 2018 - ncutler@suse.com
+
+- Update to v14.0.0-4382-g5bc0a1d022:
+  + based on upstream nautilus a0b5445bc8400b9b1f398a414001164b2d8dd290
+  + First downstream nautilus build. Notable changes:
+    * The 'ceph-disk' OSD deployment/introspection/management tool is gone.
+      Use 'ceph-volume' instead.
+    * The 'ceph osd rm' command has been deprecated. Users should use
+      'ceph osd destroy' or 'ceph osd purge' (but after first confirming it is
+      safe to do so via the 'ceph osd safe-to-destroy' command).
+    * The MDS now supports dropping its cache for the purposes of benchmarking:
+      "ceph tell mds.* cache drop <timeout>"
+    * The 'ceph pg <pgid> list_missing' command has been renamed to
+      'ceph pg <pgid> list_unfound' to better match its behaviour.
+    * The 'rbd-mirror' daemon can now retrieve remote peer cluster
+      configuration secrets from the monitor.  
+    * The is fully obsolete and references to it in the docs
+      have been removed or clarified.
+    * The libcephfs bindings added the ceph_select_filesystem function
+      for use with multiple filesystems.
+    * The cephfs python bindings now include mount_root and filesystem_name
+      options in the mount() function.
+    * erasure-code: add experimental *Coupled LAYer (CLAY)* erasure codes
+      support.
+    * The 'cache drop' OSD command has been added to drop an OSD's caches:
+      "ceph tell osd.x cache drop"
+    * The 'cache status' OSD command has been added to get the cache stats of an
+      OSD: "ceph tell osd.x cache status"
+
+-------------------------------------------------------------------
+Wed Oct 10 09:42:02 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.2-86-g62b49f06c4:
+  + rebase on upstream 13.2.2 release
+    https://ceph.com/releases/13-2-2-mimic-released/
+  + IMPORTANT NOTE: this release contains a regression in CephFS
+    which was not yet fixed at the time of this build. Do not use
+    this build on a production cluster! 
+    For details, see http://tracker.ceph.com/issues/36346
+
+-------------------------------------------------------------------
+Tue Sep 11 12:35:50 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-427-g6cd01d4dd2:
+  + cmake: no libradosstriper headers if WITH_LIBRADOSSTRIPER=OFF
+
+-------------------------------------------------------------------
+Mon Sep 10 13:06:53 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-426-gd2d4852e84:
+  + based on upstream mimic 510d48e10be716cf61b9ddd51e8bc847288ae15a
+  + bsc#1101262 - ceph's SPDK builds with march=native
+  + migrate DeepSea QA bash scripting from DeepSea repo
+
+-------------------------------------------------------------------
+Fri Aug 17 12:11:27 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-106-g9a1fcb1b6a:
+  + based on upstream mimic 0323ca11569b183509129c180dcec427aecf2a0a
+    * including upstream 13.2.1 release - for details, see
+      https://ceph.com/releases/13-2-1-mimic-released/
+  + ceph-disk: let extract_parted_partition_numbers return a list
+    (fixes a py3 issue)
+
 -------------------------------------------------------------------
 Tue Jul 10 10:37:41 UTC 2018 - ncutler@suse.com
 

ceph-test.spec

@@ -25,6 +25,7 @@
 %bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_without lttng
+%bcond_without libradosstriper
 %global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
@@ -37,7 +38,9 @@
 %endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
+%bcond_without libradosstriper
 %else
+%bcond_with libradosstriper
 %ifarch x86_64 aarch64
 %bcond_without lttng
 %else
@@ -45,11 +48,21 @@
 %endif
 %endif
 %endif
-%if 0%{?suse_version} >= 1500
+%bcond_with seastar
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros where py2 is _optional_
 %bcond_with python2
 %else
+# distros where py2 is _mandatory_
 %bcond_without python2
 %endif
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros that ship cmd2 and/or colorama
+%bcond_without cephfs_shell
+%else
+# distros that do _not_ ship cmd2/colorama
+%bcond_with cephfs_shell
+%endif
 %if 0%{without python2}
 %global _defined_if_python2_absent 1
 %endif
@@ -76,7 +89,7 @@
 # main package definition
 #################################################################################
 Name: ceph-test
-Version: 13.2.0.210+g0e990e900d
+Version: 14.0.0.4389+g4c34d15e48
 Release: 0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch: 2
@@ -92,7 +105,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-13.2.0-210-g0e990e900d.tar.bz2
+Source0: %{?_remote_tarball_prefix}ceph-14.0.0-4389-g4c34d15e48.tar.bz2
 %if 0%{?suse_version}
 Source96: checkin.sh
 Source97: README-checkin.txt
@@ -127,20 +140,29 @@ BuildRequires:	selinux-policy-devel
 %endif
 BuildRequires:	bc
 BuildRequires:	gperf
-BuildRequires:  cmake
+%if 0%{?rhel} == 7
+BuildRequires:  cmake3 > 3.5
+%else
+BuildRequires:  cmake > 3.5
+%endif
 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++
+BuildRequires:	devtoolset-7-gcc-c++ >= 7.3.1
 %else
 BuildRequires:	gcc-c++
 %endif
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	gperftools-devel >= 2.6.1
+%endif
+%if 0%{?suse_version}
 BuildRequires:	gperftools-devel >= 2.4
 %endif
+%endif
 BuildRequires:  jq
 BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
@@ -158,13 +180,8 @@ BuildRequires:	pkgconfig
 BuildRequires:  procps
 BuildRequires:	python%{_python_buildid}
 BuildRequires:	python%{_python_buildid}-devel
-BuildRequires:	python%{_python_buildid}-nose
-BuildRequires:	python%{_python_buildid}-requests
-BuildRequires:	python%{_python_buildid}-virtualenv
 BuildRequires:	snappy-devel
-%if 0%{with make_check}
+BuildRequires:	sudo
-BuildRequires:	socat
-%endif
 BuildRequires:	udev
 BuildRequires:	util-linux
 BuildRequires:	valgrind-devel
@@ -173,7 +190,27 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
-
+%if 0%{with make_check}
+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
+BuildRequires:	socat
+%endif
+%if 0%{with seastar}
+BuildRequires:  c-ares-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  hwloc-devel
+BuildRequires:  libpciaccess-devel
+BuildRequires:  lksctp-tools-devel
+BuildRequires:  protobuf-devel
+BuildRequires:  ragel
+BuildRequires:  systemtap-sdt-devel
+BuildRequires:  yaml-cpp-devel
+%endif
 #################################################################################
 # distro-conditional dependencies
 #################################################################################
@@ -206,11 +243,12 @@ BuildRequires:	btrfs-progs
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libibverbs-devel
+BuildRequires:  librdmacm-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  CUnit-devel
 BuildRequires:  redhat-lsb-core
-BuildRequires:	Cython%{_python_buildid}
+BuildRequires:	Cython
 BuildRequires:	python%{_python_buildid}-prettytable
 BuildRequires:	python%{_python_buildid}-sphinx
 BuildRequires:	lz4-devel >= 1.7
@@ -230,26 +268,15 @@ BuildRequires:	python3-Cython
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-routes
-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}-Routes
 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
@@ -273,6 +300,17 @@ BuildRequires:	expat-devel
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
 %endif
+%if 0%{with seastar}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:  cryptopp-devel
+BuildRequires:  numactl-devel
+BuildRequires:  protobuf-compiler
+%endif
+%if 0%{?suse_version}
+BuildRequires:  libcryptopp-devel
+BuildRequires:  libnuma-devel
+%endif
+%endif
 
 %description
 This package contains Ceph benchmarks and test tools.
@@ -294,6 +332,8 @@ This package contains Ceph benchmarks and test tools.
 %endif
 %if 0%{?suse_version}
 %endif
+%if 0%{with libradosstriper}
+%endif
 %if 0%{?suse_version}
 %endif
 %if 0%{?suse_version}
@@ -303,10 +343,6 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%if 0%{?fedora}
-%endif
-%if 0%{?rhel}
-%endif
 %endif
 %if 0%{?suse_version}
 %endif
@@ -352,10 +388,12 @@ This package contains Ceph benchmarks and test tools.
 %endif
 %if 0%{?suse_version}
 %endif
+%if 0%{with libradosstriper}
 %if 0%{?suse_version}
 %endif
 %if 0%{?suse_version}
 %endif
+%endif
 %if 0%{?suse_version}
 %endif
 %if 0%{?suse_version}
@@ -379,8 +417,6 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{with python2}
 %if 0%{?suse_version}
 %endif
-%if 0%{?suse_version}
-%endif
 %endif
 %if 0%{?suse_version}
 %endif
@@ -388,6 +424,10 @@ This package contains Ceph benchmarks and test tools.
 %if 0%{?suse_version}
 %endif
 %endif
+%if 0%{?suse_version}
+%endif
+%if 0%{with cephfs_shell}
+%endif
 %if 0%{with ceph_test_package}
 %if 0%{?suse_version}
 %endif
@@ -411,7 +451,7 @@ This package contains Ceph benchmarks and test tools.
 %endif
 %endif
 %prep
-%autosetup -p1 -n ceph-13.2.0-210-g0e990e900d
+%autosetup -p1 -n ceph-14.0.0-4389-g4c34d15e48
 
 %build
 
@@ -434,6 +474,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize
 export CPPFLAGS="$java_inc"
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
+test "$RPM_LD_FLAGS" && echo "RPM_LD_FLAGS == $RPM_LD_FLAGS" || echo "RPM_LD_FLAGS is empty"
 
 # Parallel build settings ...
 CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
@@ -461,7 +503,12 @@ env | sort
 
 mkdir build
 cd build
-cmake .. \
+%if 0%{?rhel} == 7
+CMAKE=cmake3
+%else
+CMAKE=cmake
+%endif
+${CMAKE} .. \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
     -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
@@ -470,7 +517,6 @@ cmake .. \
     -DCMAKE_INSTALL_MANDIR=%{_mandir} \
     -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-    -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
     -DWITH_PYTHON3=ON \
     -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
@@ -507,6 +553,14 @@ cmake .. \
     -DWITH_BOOST_CONTEXT=ON \
 %else
     -DWITH_BOOST_CONTEXT=OFF \
+%endif
+%if 0%{with cephfs_shell}
+    -DWITH_CEPHFS_SHELL=ON \
+%endif
+%if 0%{with libradosstriper}
+    -DWITH_LIBRADOSSTRIPER=ON \
+%else
+    -DWITH_LIBRADOSSTRIPER=OFF \
 %endif
     -DBOOST_J=$CEPH_SMP_NCPUS
 
@@ -552,8 +606,9 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
-install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
+
-install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
+# sudoers.d
+install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
@@ -564,6 +619,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mds
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mgr
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash/posted
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
@@ -576,23 +633,23 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
 %py3_compile %{buildroot}%{python3_sitelib}
 %endif
 
+rm -rf %{buildroot}%{_bindir}/ceph-crash
 rm -rf %{buildroot}%{_bindir}/crushtool
 rm -rf %{buildroot}%{_bindir}/monmaptool
 rm -rf %{buildroot}%{_bindir}/osdmaptool
 rm -rf %{buildroot}%{_bindir}/ceph-kvstore-tool
 rm -rf %{buildroot}%{_bindir}/ceph-run
 rm -rf %{buildroot}%{_bindir}/ceph-dencoder
-rm -rf %{buildroot}%{_bindir}/ceph-detect-init
 rm -rf %{buildroot}%{_bindir}/cephfs-data-scan
 rm -rf %{buildroot}%{_bindir}/cephfs-journal-tool
 rm -rf %{buildroot}%{_bindir}/cephfs-table-tool
 rm -rf %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
 rm -rf %{buildroot}%{_sbindir}/ceph-create-keys
-rm -rf %{buildroot}%{_sbindir}/ceph-disk
 rm -rf %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
 rm -rf %{buildroot}%{_libdir}/rados-classes/*
 rm -rf %{buildroot}%{_libdir}/ceph/erasure-code/libec_*.so*
 rm -rf %{buildroot}%{_libdir}/ceph/compressor/libceph_*.so*
+rm -rf %{buildroot}%{_unitdir}/ceph-crash.service
 rm -rf %{buildroot}%{_libdir}/ceph/crypto/libceph_*.so*
 rm -rf %{buildroot}%{_libdir}/libos_tp.so*
 rm -rf %{buildroot}%{_libdir}/libosd_tp.so*
@@ -601,20 +658,13 @@ rm -rf %{buildroot}%{_sysconfdir}/sysconfig/ceph
 rm -rf %{buildroot}%{_fillupdir}/sysconfig.*
 rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 rm -rf %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
-rm -rf %{buildroot}%{_unitdir}/ceph-disk@.service
 rm -rf %{buildroot}%{_unitdir}/ceph.target
-rm -rf %{buildroot}%{python_sitelib}/ceph_detect_init*
-rm -rf %{buildroot}%{python_sitelib}/ceph_disk*
-rm -rf %{buildroot}%{python3_sitelib}/ceph_detect_init*
-rm -rf %{buildroot}%{python3_sitelib}/ceph_disk*
 rm -rf %{buildroot}%{python_sitelib}/ceph_volume/*
 rm -rf %{buildroot}%{python_sitelib}/ceph_volume-*
 rm -rf %{buildroot}%{python3_sitelib}/ceph_volume/*
 rm -rf %{buildroot}%{python3_sitelib}/ceph_volume-*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8*
-rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
-rm -rf %{buildroot}%{_mandir}/man8/ceph-disk.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-run.8*
 rm -rf %{buildroot}%{_mandir}/man8/crushtool.8*
 rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8*
@@ -664,12 +714,6 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/rbd
 rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/radosgw-admin
 rm -rf %{buildroot}%{_sysconfdir}/ceph/rbdmap
 rm -rf %{buildroot}%{_unitdir}/rbdmap.service
-rm -rf %{buildroot}%{python_sitelib}/ceph_argparse.py*
-rm -rf %{buildroot}%{python_sitelib}/ceph_daemon.py*
-rm -rf %{buildroot}%{python3_sitelib}/ceph_argparse.py
-rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
-rm -rf %{buildroot}%{python3_sitelib}/ceph_daemon.py
-rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
 rm -rf %{buildroot}%{_udevrulesdir}/50-rbd.rules
 rm -rf %{buildroot}%{_bindir}/ceph-mds
 rm -rf %{buildroot}%{_mandir}/man8/ceph-mds.8*
@@ -712,8 +756,6 @@ rm -rf %{buildroot}%{_bindir}/ceph-osd
 rm -rf %{buildroot}%{_libexecdir}/ceph/ceph-osd-prestart.sh
 rm -rf %{buildroot}%{_sbindir}/ceph-volume
 rm -rf %{buildroot}%{_sbindir}/ceph-volume-systemd
-rm -rf %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
-rm -rf %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
 rm -rf %{buildroot}%{_mandir}/man8/ceph-clsinfo.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-osd.8*
 rm -rf %{buildroot}%{_mandir}/man8/ceph-bluestore-tool.8*
@@ -724,6 +766,7 @@ rm -rf %{buildroot}%{_unitdir}/ceph-osd@.service
 rm -rf %{buildroot}%{_unitdir}/ceph-osd.target
 rm -rf %{buildroot}%{_unitdir}/ceph-volume@.service
 rm -rf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
+rm -rf %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 rm -rf %{buildroot}%{_prefix}/lib/ocf/resource.d/ceph/rbd
 rm -rf %{buildroot}%{_libdir}/librados.so.*
 rm -rf %{buildroot}%{_libdir}/ceph/libceph-common.so*
@@ -737,7 +780,6 @@ rm -rf %{buildroot}%{_includedir}/rados/page.h
 rm -rf %{buildroot}%{_includedir}/rados/crc32c.h
 rm -rf %{buildroot}%{_includedir}/rados/rados_types.h
 rm -rf %{buildroot}%{_includedir}/rados/rados_types.hpp
-rm -rf %{buildroot}%{_includedir}/rados/memory.h
 rm -rf %{buildroot}%{_libdir}/librados.so
 rm -rf %{buildroot}%{_libdir}/librados_tp.so
 rm -rf %{buildroot}%{_bindir}/librados-config
@@ -758,11 +800,14 @@ rm -rf %{buildroot}%{_includedir}/rbd/features.h
 rm -rf %{buildroot}%{_libdir}/librbd.so
 rm -rf %{buildroot}%{_libdir}/librbd_tp.so
 rm -rf %{buildroot}%{_libdir}/librgw.so.*
+rm -rf %{buildroot}%{_libdir}/librgw_admin_user.so.*
 rm -rf %{buildroot}%{_libdir}/librgw_op_tp.so*
 rm -rf %{buildroot}%{_libdir}/librgw_rados_tp.so*
 rm -rf %{buildroot}%{_includedir}/rados/librgw.h
+rm -rf %{buildroot}%{_includedir}/rados/librgw_admin_user.h
 rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h
 rm -rf %{buildroot}%{_libdir}/librgw.so
+rm -rf %{buildroot}%{_libdir}/librgw_admin_user.so
 rm -rf %{buildroot}%{python_sitearch}/rgw.so
 rm -rf %{buildroot}%{python_sitearch}/rgw-*.egg-info
 rm -rf %{buildroot}%{python3_sitearch}/rgw.cpython*.so
@@ -782,10 +827,14 @@ rm -rf %{buildroot}%{python3_sitearch}/cephfs.cpython*.so
 rm -rf %{buildroot}%{python3_sitearch}/cephfs-*.egg-info
 rm -rf %{buildroot}%{python3_sitelib}/ceph_volume_client.py
 rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
+rm -rf %{buildroot}%{python_sitelib}/ceph_argparse.py*
+rm -rf %{buildroot}%{python_sitelib}/ceph_daemon.py*
 rm -rf %{buildroot}%{python3_sitelib}/ceph_argparse.py
 rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
 rm -rf %{buildroot}%{python3_sitelib}/ceph_daemon.py
 rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+rm -rf %{buildroot}%{python3_sitelib}/cephfs_shell-*.egg-info
+rm -rf %{buildroot}%{_bindir}/cephfs-shell
 rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so.*
 rm -rf %{buildroot}%{_libdir}/libcephfs_jni.so
 rm -rf %{buildroot}%{_javadir}/libcephfs.jar
@@ -821,8 +870,6 @@ rm -rf %{buildroot}
 %endif
 %if 0%{with python2}
 %endif
-%if 0%{with python2}
-%endif
 %if 0%{?suse_version}
 %endif
 %if 0%{?fedora} || 0%{?rhel}
@@ -839,8 +886,6 @@ rm -rf %{buildroot}
 %endif
 %if %{with lttng}
 %endif
-%if 0%{with python2}
-%endif
 %if 0%{?rhel} || 0%{?fedora}
 %endif
 %if 0%{?suse_version}
@@ -929,6 +974,8 @@ rm -rf %{buildroot}
 %endif
 %if 0%{with python2}
 %endif
+%if 0%{with libradosstriper}
+%endif
 %if %{with lttng}
 %endif
 %if %{with lttng}
@@ -943,6 +990,8 @@ rm -rf %{buildroot}
 %endif
 %if 0%{with python2}
 %endif
+%if 0%{with cephfs_shell}
+%endif
 %if 0%{with ceph_test_package}
 %files -n ceph-test
 %{_bindir}/ceph-client-debug

ceph.changes

@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Thu Oct 25 09:17:58 UTC 2018 - ncutler@suse.com
+
+- Update to v14.0.0-4389-g4c34d15e48:
+  + based on upstream nautilus a0b5445bc8400b9b1f398a414001164b2d8dd290
+  + First downstream nautilus build. Notable changes:
+    * The 'ceph-disk' OSD deployment/introspection/management tool is gone.
+      Use 'ceph-volume' instead.
+    * The 'ceph osd rm' command has been deprecated. Users should use
+      'ceph osd destroy' or 'ceph osd purge' (but after first confirming it is
+      safe to do so via the 'ceph osd safe-to-destroy' command).
+    * The MDS now supports dropping its cache for the purposes of benchmarking:
+      "ceph tell mds.* cache drop <timeout>"
+    * The 'ceph pg <pgid> list_missing' command has been renamed to
+      'ceph pg <pgid> list_unfound' to better match its behaviour.
+    * The 'rbd-mirror' daemon can now retrieve remote peer cluster
+      configuration secrets from the monitor.  
+    * The is fully obsolete and references to it in the docs
+      have been removed or clarified.
+    * The libcephfs bindings added the ceph_select_filesystem function
+      for use with multiple filesystems.
+    * The cephfs python bindings now include mount_root and filesystem_name
+      options in the mount() function.
+    * erasure-code: add experimental *Coupled LAYer (CLAY)* erasure codes
+      support.
+    * The 'cache drop' OSD command has been added to drop an OSD's caches:
+      "ceph tell osd.x cache drop"
+    * The 'cache status' OSD command has been added to get the cache stats of an
+      OSD: "ceph tell osd.x cache status"
+
+-------------------------------------------------------------------
+Wed Oct 10 09:42:02 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.2-86-g62b49f06c4:
+  + rebase on upstream 13.2.2 release
+    https://ceph.com/releases/13-2-2-mimic-released/
+  + IMPORTANT NOTE: this release contains a regression in CephFS
+    which was not yet fixed at the time of this build. Do not use
+    this build on a production cluster! 
+    For details, see http://tracker.ceph.com/issues/36346
+
+-------------------------------------------------------------------
+Tue Sep 11 12:35:50 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-427-g6cd01d4dd2:
+  + cmake: no libradosstriper headers if WITH_LIBRADOSSTRIPER=OFF
+
+-------------------------------------------------------------------
+Mon Sep 10 13:06:53 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-426-gd2d4852e84:
+  + based on upstream mimic 510d48e10be716cf61b9ddd51e8bc847288ae15a
+  + bsc#1101262 - ceph's SPDK builds with march=native
+  + migrate DeepSea QA bash scripting from DeepSea repo
+
+-------------------------------------------------------------------
+Fri Aug 17 12:11:27 UTC 2018 - ncutler@suse.com
+
+- Update to 13.2.1-106-g9a1fcb1b6a:
+  + based on upstream mimic 0323ca11569b183509129c180dcec427aecf2a0a
+    * including upstream 13.2.1 release - for details, see
+      https://ceph.com/releases/13-2-1-mimic-released/
+  + ceph-disk: let extract_parted_partition_numbers return a list
+    (fixes a py3 issue)
+
 -------------------------------------------------------------------
 Tue Jul 10 10:37:41 UTC 2018 - ncutler@suse.com
 

ceph.spec

@@ -25,6 +25,7 @@
 %bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_without lttng
+%bcond_without libradosstriper
 %global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
@@ -37,7 +38,9 @@
 %endif
 %if 0%{?is_opensuse}
 %bcond_without lttng
+%bcond_without libradosstriper
 %else
+%bcond_with libradosstriper
 %ifarch x86_64 aarch64
 %bcond_without lttng
 %else
@@ -45,11 +48,21 @@
 %endif
 %endif
 %endif
-%if 0%{?suse_version} >= 1500
+%bcond_with seastar
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros where py2 is _optional_
 %bcond_with python2
 %else
+# distros where py2 is _mandatory_
 %bcond_without python2
 %endif
+%if 0%{?fedora} || 0%{?suse_version} >= 1500
+# distros that ship cmd2 and/or colorama
+%bcond_without cephfs_shell
+%else
+# distros that do _not_ ship cmd2/colorama
+%bcond_with cephfs_shell
+%endif
 %if 0%{without python2}
 %global _defined_if_python2_absent 1
 %endif
@@ -76,7 +89,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	13.2.0.210+g0e990e900d
+Version:	14.0.0.4389+g4c34d15e48
 Release:	0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
@@ -92,7 +105,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-13.2.0-210-g0e990e900d.tar.bz2
+Source0:	%{?_remote_tarball_prefix}ceph-14.0.0-4389-g4c34d15e48.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 %if 0%{?is_opensuse}
@@ -119,20 +132,29 @@ BuildRequires:	selinux-policy-devel
 %endif
 BuildRequires:	bc
 BuildRequires:	gperf
-BuildRequires:  cmake
+%if 0%{?rhel} == 7
+BuildRequires:  cmake3 > 3.5
+%else
+BuildRequires:  cmake > 3.5
+%endif
 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++
+BuildRequires:	devtoolset-7-gcc-c++ >= 7.3.1
 %else
 BuildRequires:	gcc-c++
 %endif
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:	gperftools-devel >= 2.6.1
+%endif
+%if 0%{?suse_version}
 BuildRequires:	gperftools-devel >= 2.4
 %endif
+%endif
 BuildRequires:  jq
 BuildRequires:	leveldb-devel > 1.2
 BuildRequires:	libaio-devel
@@ -150,13 +172,8 @@ BuildRequires:	pkgconfig
 BuildRequires:  procps
 BuildRequires:	python%{_python_buildid}
 BuildRequires:	python%{_python_buildid}-devel
-BuildRequires:	python%{_python_buildid}-nose
-BuildRequires:	python%{_python_buildid}-requests
-BuildRequires:	python%{_python_buildid}-virtualenv
 BuildRequires:	snappy-devel
-%if 0%{with make_check}
+BuildRequires:	sudo
-BuildRequires:	socat
-%endif
 BuildRequires:	udev
 BuildRequires:	util-linux
 BuildRequires:	valgrind-devel
@@ -165,7 +182,27 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
-
+%if 0%{with make_check}
+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
+BuildRequires:	socat
+%endif
+%if 0%{with seastar}
+BuildRequires:  c-ares-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  hwloc-devel
+BuildRequires:  libpciaccess-devel
+BuildRequires:  lksctp-tools-devel
+BuildRequires:  protobuf-devel
+BuildRequires:  ragel
+BuildRequires:  systemtap-sdt-devel
+BuildRequires:  yaml-cpp-devel
+%endif
 #################################################################################
 # distro-conditional dependencies
 #################################################################################
@@ -198,11 +235,12 @@ BuildRequires:	btrfs-progs
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libibverbs-devel
+BuildRequires:  librdmacm-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  CUnit-devel
 BuildRequires:  redhat-lsb-core
-BuildRequires:	Cython%{_python_buildid}
+BuildRequires:	Cython
 BuildRequires:	python%{_python_buildid}-prettytable
 BuildRequires:	python%{_python_buildid}-sphinx
 BuildRequires:	lz4-devel >= 1.7
@@ -222,26 +260,15 @@ BuildRequires:	python3-Cython
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-routes
-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}-Routes
 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
@@ -265,6 +292,17 @@ BuildRequires:	expat-devel
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
 %endif
+%if 0%{with seastar}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:  cryptopp-devel
+BuildRequires:  numactl-devel
+BuildRequires:  protobuf-compiler
+%endif
+%if 0%{?suse_version}
+BuildRequires:  libcryptopp-devel
+BuildRequires:  libnuma-devel
+%endif
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
@@ -279,6 +317,7 @@ Summary:       Ceph Base Package
 %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}
@@ -323,6 +362,7 @@ 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}
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	python%{_python_buildid}-prettytable
 Requires:	python%{_python_buildid}-requests
@@ -333,6 +373,9 @@ Requires:	python%{_python_buildid}-requests
 Provides:       libxio = 1.7
 Obsoletes:      libxio <= 1.7
 %endif
+%if 0%{with libradosstriper}
+Requires:	libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
+%endif
 %{?systemd_requires}
 %if 0%{?suse_version}
 PreReq:         permissions
@@ -358,6 +401,7 @@ Summary:	Ceph Monitor Daemon
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
+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
@@ -371,26 +415,21 @@ Summary:        Ceph Manager Daemon
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires:       python%{_python_buildid}-pecan
+Requires:       python%{_python_buildid}-six
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       python%{_python_buildid}-cherrypy
-Requires:       python%{_python_buildid}-routes
 Requires:       python%{_python_buildid}-jinja2
-Requires:       python%{_python_buildid}-pecan
+Requires:       python%{_python_buildid}-routes
 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
 Requires:       python%{_python_buildid}-Routes
 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
@@ -480,8 +519,10 @@ Summary:	Ceph Object Storage Daemon
 %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
 %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
@@ -586,6 +627,7 @@ Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 This package contains Python 3 libraries for interacting with Cephs RADOS
 object store.
 
+%if 0%{with libradosstriper}
 %package -n libradosstriper1
 Summary:	RADOS striping interface
 %if 0%{?suse_version}
@@ -610,6 +652,7 @@ 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
@@ -705,9 +748,8 @@ Summary:	Python 2 libraries for Ceph distributed file system
 Group:		Development/Libraries/Python
 %endif
 Requires:	libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-%if 0%{?suse_version}
+Requires:	python-rados = %{_epoch_prefix}%{version}-%{release}
-Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
-%endif
 Obsoletes:	python-ceph < %{_epoch_prefix}%{version}-%{release}
 %description -n python-cephfs
 This package contains Python 2 libraries for interacting with Cephs distributed
@@ -721,11 +763,24 @@ 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}
 %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
+%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
+well as the RESTful interface. These have to do with querying the daemons for
+command-description information, validating user command input against those
+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
 %if 0%{?suse_version}
@@ -736,6 +791,17 @@ This package contains types and routines for Python 3 used by the Ceph CLI as
 well as the RESTful interface. These have to do with querying the daemons for
 command-description information, validating user command input against those
 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
+%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
+works like an FTP client.
 %endif
 
 %if 0%{with ceph_test_package}
@@ -845,7 +911,7 @@ python-rbd, python-rgw or python-cephfs instead.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-13.2.0-210-g0e990e900d
+%autosetup -p1 -n ceph-14.0.0-4389-g4c34d15e48
 
 %build
 
@@ -868,6 +934,8 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize
 export CPPFLAGS="$java_inc"
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
+test "$RPM_LD_FLAGS" && echo "RPM_LD_FLAGS == $RPM_LD_FLAGS" || echo "RPM_LD_FLAGS is empty"
 
 # Parallel build settings ...
 CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
@@ -895,7 +963,12 @@ env | sort
 
 mkdir build
 cd build
-cmake .. \
+%if 0%{?rhel} == 7
+CMAKE=cmake3
+%else
+CMAKE=cmake
+%endif
+${CMAKE} .. \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
     -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
@@ -904,7 +977,6 @@ cmake .. \
     -DCMAKE_INSTALL_MANDIR=%{_mandir} \
     -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-    -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
     -DWITH_PYTHON3=ON \
     -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
@@ -941,6 +1013,14 @@ cmake .. \
     -DWITH_BOOST_CONTEXT=ON \
 %else
     -DWITH_BOOST_CONTEXT=OFF \
+%endif
+%if 0%{with cephfs_shell}
+    -DWITH_CEPHFS_SHELL=ON \
+%endif
+%if 0%{with libradosstriper}
+    -DWITH_LIBRADOSSTRIPER=ON \
+%else
+    -DWITH_LIBRADOSSTRIPER=OFF \
 %endif
     -DBOOST_J=$CEPH_SMP_NCPUS
 
@@ -986,8 +1066,9 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
-install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
+
-install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
+# sudoers.d
+install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
@@ -998,6 +1079,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mds
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mgr
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash/posted
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
@@ -1019,19 +1102,18 @@ rm -rf %{buildroot}
 %files
 
 %files base
+%{_bindir}/ceph-crash
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
 %{_bindir}/ceph-kvstore-tool
 %{_bindir}/ceph-run
 %{_bindir}/ceph-dencoder
-%{_bindir}/ceph-detect-init
 %{_bindir}/cephfs-data-scan
 %{_bindir}/cephfs-journal-tool
 %{_bindir}/cephfs-table-tool
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
-%{_sbindir}/ceph-disk
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
@@ -1041,6 +1123,7 @@ rm -rf %{buildroot}
 %{_libdir}/ceph/erasure-code/libec_*.so*
 %dir %{_libdir}/ceph/compressor
 %{_libdir}/ceph/compressor/libceph_*.so*
+%{_unitdir}/ceph-crash.service
 %ifarch x86_64
 %dir %{_libdir}/ceph/crypto
 %{_libdir}/ceph/crypto/libceph_*.so*
@@ -1058,16 +1141,8 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 %endif
-%{_unitdir}/ceph-disk@.service
 %{_unitdir}/ceph.target
 %if 0%{with python2}
-%{python_sitelib}/ceph_detect_init*
-%{python_sitelib}/ceph_disk*
-%else
-%{python3_sitelib}/ceph_detect_init*
-%{python3_sitelib}/ceph_disk*
-%endif
-%if 0%{with python2}
 %dir %{python_sitelib}/ceph_volume
 %{python_sitelib}/ceph_volume/*
 %{python_sitelib}/ceph_volume-*
@@ -1077,15 +1152,15 @@ rm -rf %{buildroot}
 %{python3_sitelib}/ceph_volume-*
 %endif
 %{_mandir}/man8/ceph-deploy.8*
-%{_mandir}/man8/ceph-detect-init.8*
 %{_mandir}/man8/ceph-create-keys.8*
-%{_mandir}/man8/ceph-disk.8*
 %{_mandir}/man8/ceph-run.8*
 %{_mandir}/man8/crushtool.8*
 %{_mandir}/man8/osdmaptool.8*
 %{_mandir}/man8/monmaptool.8*
 %{_mandir}/man8/ceph-kvstore-tool.8*
 #set up placeholder directories
+%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/crash
+%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/crash/posted
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mds
@@ -1098,22 +1173,22 @@ rm -rf %{buildroot}
 %if 0%{?suse_version}
 %fillup_only
 if [ $1 -eq 1 ] ; then
-/usr/bin/systemctl preset ceph-disk@\*.service ceph.target >/dev/null 2>&1 || :
+/usr/bin/systemctl preset ceph.target ceph-crash.service >/dev/null 2>&1 || :
 fi
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_post ceph-disk@\*.service ceph.target
+%systemd_post ceph.target ceph-crash.service
 %endif
 if [ $1 -eq 1 ] ; then
-/usr/bin/systemctl start ceph.target >/dev/null 2>&1 || :
+/usr/bin/systemctl start ceph.target ceph-crash.service >/dev/null 2>&1 || :
 fi
 
 %preun base
 %if 0%{?suse_version}
-%service_del_preun ceph-disk@\*.service ceph.target
+%service_del_preun ceph.target ceph-crash.service
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_preun ceph-disk@\*.service ceph.target
+%systemd_preun ceph.target ceph-crash.service
 %endif
 
 %postun base
@@ -1121,10 +1196,10 @@ fi
 test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
-%service_del_postun ceph-disk@\*.service ceph.target
+%service_del_postun ceph.target
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-%systemd_postun ceph-disk@\*.service ceph.target
+%systemd_postun ceph.target
 %endif
 if [ $FIRST_ARG -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
@@ -1133,9 +1208,6 @@ if [ $FIRST_ARG -ge 1 ] ; then
   if [ -f $SYSCONF_CEPH -a -r $SYSCONF_CEPH ] ; then
     source $SYSCONF_CEPH
   fi
-  if [ "X$CEPH_AUTO_RESTART_ON_UPGRADE" = "Xyes" ] ; then
-    /usr/bin/systemctl try-restart ceph-disk@\*.service > /dev/null 2>&1 || :
-  fi
 fi
 
 %files common
@@ -1188,15 +1260,6 @@ fi
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %{_unitdir}/rbdmap.service
-%if 0%{with python2}
-%{python_sitelib}/ceph_argparse.py*
-%{python_sitelib}/ceph_daemon.py*
-%else
-%{python3_sitelib}/ceph_argparse.py
-%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
-%{python3_sitelib}/ceph_daemon.py
-%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
-%endif
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/50-rbd.rules
 %attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
@@ -1510,9 +1573,6 @@ fi
 %{_libexecdir}/ceph/ceph-osd-prestart.sh
 %{_sbindir}/ceph-volume
 %{_sbindir}/ceph-volume-systemd
-%dir %{_udevrulesdir}
-%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
-%{_udevrulesdir}/95-ceph-osd.rules
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-osd.8*
 %{_mandir}/man8/ceph-bluestore-tool.8*
@@ -1526,6 +1586,7 @@ fi
 %{_unitdir}/ceph-volume@.service
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/osd
 %config(noreplace) %{_sysctldir}/90-ceph-osd.conf
+%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
 
 %post osd
 %if 0%{?suse_version}
@@ -1607,7 +1668,6 @@ fi
 %{_includedir}/rados/crc32c.h
 %{_includedir}/rados/rados_types.h
 %{_includedir}/rados/rados_types.hpp
-%{_includedir}/rados/memory.h
 %{_libdir}/librados.so
 %if %{with lttng}
 %{_libdir}/librados_tp.so
@@ -1625,6 +1685,7 @@ fi
 %{python3_sitearch}/rados.cpython*.so
 %{python3_sitearch}/rados-*.egg-info
 
+%if 0%{with libradosstriper}
 %files -n libradosstriper1
 %{_libdir}/libradosstriper.so.*
 
@@ -1637,6 +1698,7 @@ fi
 %{_includedir}/radosstriper/libradosstriper.h
 %{_includedir}/radosstriper/libradosstriper.hpp
 %{_libdir}/libradosstriper.so
+%endif
 
 %files -n librbd1
 %{_libdir}/librbd.so.*
@@ -1660,6 +1722,7 @@ fi
 
 %files -n librgw2
 %{_libdir}/librgw.so.*
+%{_libdir}/librgw_admin_user.so.*
 %if %{with lttng}
 %{_libdir}/librgw_op_tp.so*
 %{_libdir}/librgw_rados_tp.so*
@@ -1672,8 +1735,10 @@ fi
 %files -n librgw-devel
 %dir %{_includedir}/rados
 %{_includedir}/rados/librgw.h
+%{_includedir}/rados/librgw_admin_user.h
 %{_includedir}/rados/rgw_file.h
 %{_libdir}/librgw.so
+%{_libdir}/librgw_admin_user.so
 
 %if 0%{with python2}
 %files -n python-rgw
@@ -1722,11 +1787,21 @@ fi
 %{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
 
 %if 0%{with python2}
+%files -n python-ceph-argparse
+%{python_sitelib}/ceph_argparse.py*
+%{python_sitelib}/ceph_daemon.py*
+%endif
+
 %files -n python%{python3_pkgversion}-ceph-argparse
 %{python3_sitelib}/ceph_argparse.py
 %{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
 %{python3_sitelib}/ceph_daemon.py
 %{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+
+%if 0%{with cephfs_shell}
+%files -n cephfs-shell
+%{python3_sitelib}/cephfs_shell-*.egg-info
+%{_bindir}/cephfs-shell
 %endif
 
 %if 0%{with ceph_test_package}
@@ -1812,13 +1887,8 @@ if test $STATUS -eq 0; then
     /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
 fi
 
-# Relabel the files
+# Relabel the files fix for first package install
-# Use ceph-disk fix for first package install and fixfiles otherwise
+/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
-if [ "$1" = "1" ]; then
-    /usr/sbin/ceph-disk fix --selinux
-else
-    /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
-fi
 
 rm -f ${FILE_CONTEXT}.pre
 # The fixfiles command won't fix label for /var/run/ceph