Merge remote-tracking branch 'origin/f29' into f28

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0001-blobstore.patch

@@ -1,51 +0,0 @@
---- ceph-13.2.1/src/spdk/lib/blob/blobstore.c.orig	2018-07-30 08:31:05.138254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/blob/blobstore.c	2018-07-30 08:32:05.314254900 -0400
-@@ -393,7 +393,7 @@
- 	 * happen for example if a bogus blobid is passed in through open.
- 	 */
- 	if (blob->id != pages[0].id) {
--		SPDK_ERRLOG("Blobid (%lu) doesn't match what's in metadata (%lu)\n",
-+		SPDK_ERRLOG("Blobid (%llu) doesn't match what's in metadata (%llu)\n",
- 			    blob->id, pages[0].id);
- 		return -ENOENT;
- 	}
-@@ -2947,7 +2947,7 @@
- 
- /* START spdk_blob_resize */
- int
--spdk_blob_resize(struct spdk_blob *_blob, uint64_t sz)
-+spdk_blob_resize(struct spdk_blob *_blob, size_t sz)
- {
- 	struct spdk_blob_data	*blob = __blob_to_data(_blob);
- 	int			rc;
---- ceph-13.2.1/src/spdk/lib/lvol/lvol.c.orig	2018-07-30 09:08:38.137254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/lvol/lvol.c	2018-07-30 09:10:09.642254900 -0400
-@@ -970,7 +970,7 @@
- 	num_clusters = divide_round_up(sz, spdk_bs_get_cluster_size(bs));
- 	free_clusters = spdk_bs_free_cluster_count(bs);
- 	if (num_clusters > free_clusters) {
--		SPDK_ERRLOG("Not enough free clusters left (%zu) on lvol store to add lvol %zu clusters\n",
-+		SPDK_ERRLOG("Not enough free clusters left (%llu) on lvol store to add lvol %llu clusters\n",
- 			    free_clusters, num_clusters);
- 		return -ENOMEM;
- 	}
-@@ -1026,7 +1026,7 @@
- 	if (new_clusters > used_clusters) {
- 		/* Check if there is enough clusters left to resize */
- 		if (new_clusters - used_clusters > free_clusters) {
--			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %zu clusters\n", sz);
-+			SPDK_ERRLOG("Not enough free clusters left on lvol store to resize lvol to %llu clusters\n", sz);
- 			return -ENOMEM;
- 		}
- 	}
---- ceph-13.2.1/src/spdk/lib/event/reactor.c.orig	2018-07-30 09:44:01.514254900 -0400
-+++ ceph-13.2.1/src/spdk/lib/event/reactor.c	2018-07-30 09:45:02.291254900 -0400
-@@ -651,7 +651,7 @@
- 	char mempool_name[32];
- 
- 	socket_mask = spdk_reactor_get_socket_mask();
--	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%lx\n", socket_mask);
-+	SPDK_NOTICELOG("Occupied cpu socket mask is 0x%" PRIx64 "\n", socket_mask);
- 
- 	for (i = 0; i < SPDK_MAX_SOCKET; i++) {
- 		if ((1ULL << i) & socket_mask) {

0006-f30py3.patch

@@ -1,127 +0,0 @@
---- ceph-12.2.8/src/CMakeLists.txt.orig	2018-09-12 10:32:04.536254900 -0400
-+++ ceph-12.2.8/src/CMakeLists.txt	2018-09-12 10:32:22.454254900 -0400
-@@ -244,9 +244,6 @@
- endif()
- 
- # Python stuff
--find_package(PythonInterp 2 REQUIRED)
--find_package(PythonLibs 2 REQUIRED)
--
- option(WITH_PYTHON3 "build python3 bindings" "CHECK")
- if(WITH_PYTHON3 MATCHES "check|CHECK")
-   find_package(Python3Interp 3 QUIET)
---- ceph-12.2.8/src/pybind/CMakeLists.txt.orig	2018-09-12 10:45:44.057254900 -0400
-+++ ceph-12.2.8/src/pybind/CMakeLists.txt	2018-09-12 12:36:23.604254900 -0400
-@@ -6,7 +6,6 @@
- if(WITH_PYTHON3)
-   set(py_vers 3)
- endif()
--list(APPEND py_vers 2)
- 
- foreach(python_version ${py_vers})
-   if(${python_version} EQUAL 2)
-@@ -58,7 +57,7 @@
- 
- install(FILES
-   ${CMAKE_CURRENT_SOURCE_DIR}/ceph_rest_api.py
--  DESTINATION ${PYTHON_INSTDIR})
-+  DESTINATION ${PYTHON${PYTHON_VERSION}_INSTDIR})
- 
- if(WITH_MGR)
-   # Location needs to match default setting for mgr_module_path, currently:
---- ceph-12.2.8/src/tools/setup-virtualenv.sh.orig	2018-09-13 10:57:53.530254900 -0400
-+++ ceph-12.2.8/src/tools/setup-virtualenv.sh	2018-09-13 13:02:10.455254900 -0400
-@@ -15,10 +15,12 @@
- # GNU Library Public License for more details.
- #
- 
-+echo ====================== setup-virtualenv $DIR ================ 
-+
- DIR=$1
- rm -fr $DIR
- mkdir -p $DIR
--virtualenv --python python2.7 $DIR
-+virtualenv --python python3 $DIR
- . $DIR/bin/activate
- 
- if pip --help | grep -q disable-pip-version-check; then
---- ceph-12.2.8/src/ceph.in.orig	2018-09-13 13:16:24.181254900 -0400
-+++ ceph-12.2.8/src/ceph.in	2018-09-13 13:16:33.608254900 -0400
-@@ -1,4 +1,4 @@
--#!@PYTHON_EXECUTABLE@
-+#!@PYTHON3_EXECUTABLE@
- # -*- mode:python -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
-diff -ur ceph-12.2.5/src/brag/client/ceph-brag ceph-12.2.5-mod/src/brag/client/ceph-brag
---- ceph-12.2.5/src/brag/client/ceph-brag	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/brag/client/ceph-brag	2018-05-22 21:06:32.952813105 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- 
-diff -ur ceph-12.2.5/src/ceph-create-keys ceph-12.2.5-mod/src/ceph-create-keys
---- ceph-12.2.5/src/ceph-create-keys	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-create-keys	2018-05-22 21:09:49.103398176 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import argparse
- import errno
- import json
-diff -ur ceph-12.2.5/src/ceph-detect-init/ceph_detect_init/main.py ceph-12.2.5-mod/src/ceph-detect-init/ceph_detect_init/main.py
---- ceph-12.2.5/src/ceph-detect-init/ceph_detect_init/main.py	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-detect-init/ceph_detect_init/main.py	2018-05-22 21:09:14.943993086 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015 <contact@redhat.com>
- # Copyright (C) 2015 SUSE LINUX GmbH
-diff -ur ceph-12.2.5/src/ceph-disk/ceph_disk/main.py ceph-12.2.5-mod/src/ceph-disk/ceph_disk/main.py
---- ceph-12.2.5/src/ceph-disk/ceph_disk/main.py	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-disk/ceph_disk/main.py	2018-05-22 21:11:02.606118074 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015, 2016, 2017 Red Hat <contact@redhat.com>
- # Copyright (C) 2014 Inktank <info@inktank.com>
-diff -ur ceph-12.2.5/src/ceph-rest-api ceph-12.2.5-mod/src/ceph-rest-api
---- ceph-12.2.5/src/ceph-rest-api	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-rest-api	2018-05-22 21:10:50.202334095 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # vim: ts=4 sw=4 smarttab expandtab
- 
- import argparse
-diff -ur ceph-12.2.5/src/ceph-volume/bin/ceph-volume ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume
---- ceph-12.2.5/src/ceph-volume/bin/ceph-volume	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume	2018-05-22 21:07:43.104592535 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume import main
- 
-diff -ur ceph-12.2.5/src/ceph-volume/bin/ceph-volume-systemd ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume-systemd
---- ceph-12.2.5/src/ceph-volume/bin/ceph-volume-systemd	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/ceph-volume/bin/ceph-volume-systemd	2018-05-22 21:07:46.628531163 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume.systemd import main
- 
-diff -ur ceph-12.2.5/src/mount.fuse.ceph ceph-12.2.5-mod/src/mount.fuse.ceph
---- ceph-12.2.5/src/mount.fuse.ceph	2018-04-23 18:18:33.000000000 +0200
-+++ ceph-12.2.5-mod/src/mount.fuse.ceph	2018-05-22 21:08:06.355187609 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- '''
- Helper to mount ceph-fuse from /etc/fstab.  To use, add an entry
- like:

0007-src-osd-PrimaryLogPG.cc.patch

@@ -1,19 +1,24 @@
---- ceph-12.2.9/src/osd/PrimaryLogPG.cc.orig	2018-10-29 09:12:57.766116270 -0400
-+++ ceph-12.2.9/src/osd/PrimaryLogPG.cc	2018-10-29 09:32:37.146116270 -0400
-@@ -20,6 +20,7 @@
- #include "PG.h"
- #include "PrimaryLogPG.h"
- #include "OSD.h"
-+#include <algorithm>
- #include "OpRequest.h"
- #include "ScrubStore.h"
- #include "Session.h"
-@@ -1586,7 +1587,7 @@
+--- ceph-12.2.11/src/osd/PrimaryLogPG.cc.orig	2019-02-02 01:29:42.853608099 -0500
++++ ceph-12.2.11/src/osd/PrimaryLogPG.cc	2019-02-02 12:39:33.841608099 -0500
+@@ -1582,8 +1582,9 @@
+   if (limit != eversion_t() &&
+       limit != pg_trim_to &&
+       pg_log.get_log().approx_size() > target) {
++    size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max;
+     size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
+-                             cct->_conf->osd_pg_log_trim_max);
++                                  osd_pg_log_trim_max);
+     if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
+         cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
+       return;
+@@ -1628,8 +1629,9 @@
        pg_log.get_log().approx_size() > target) {
      dout(10) << __func__ << " approx pg log length =  "
               << pg_log.get_log().approx_size() << dendl;
--    size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
-+    size_t num_to_trim = std::min<uint64_t>(pg_log.get_log().approx_size() - target,
- 				  cct->_conf->osd_pg_log_trim_max);
++    size_t osd_pg_log_trim_max = cct->_conf->osd_pg_log_trim_max;
+     size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
+-				  cct->_conf->osd_pg_log_trim_max);
++				  osd_pg_log_trim_max);
      dout(10) << __func__ << " num_to_trim =  " << num_to_trim << dendl;
      if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
+ 	cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {

ceph.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
 %global _hardened_build 1
-%global fixme 0
 
 %bcond_without ocf
 %ifnarch armv7hl
@@ -63,17 +62,12 @@
 
 %if %{with selinux}
 # get selinux policy version
-%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0}
+%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
 %endif
 
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
 %{!?python3_pkgversion: %global python3_pkgversion 3}
-%if ( 0%{?fedora} && 0%{?fedora} > 29) || ( 0%{?rhel} && 0%{?rhel} > 7)
-%global _pythonver 3
-%else
-%global _pythonver 2
-%endif
 
 # unify libexec for all targets
 %global _libexecdir %{_exec_prefix}/lib
@@ -91,7 +85,7 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.2.9
+Version:	12.2.12
 Release:	1%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		1
@@ -113,7 +107,6 @@ Patch001:	0001-src-rocksdb-util-murmurhash.patch
 Patch002:	0002-cmake-Support-ppc64.patch
 Patch003:	0003-librbd-Conditionally-import-TrimRequest.cc.patch
 Patch005:	0005-src-rocksdb-table-block.h.patch
-Patch006:	0006-f30py3.patch
 Patch007:	0007-src-osd-PrimaryLogPG.cc.patch
 %if 0%{?suse_version}
 %if 0%{?is_opensuse}
@@ -127,9 +120,7 @@ ExclusiveArch:	x86_64 aarch64 ppc64le s390x
 #################################################################################
 Requires:       ceph-osd = %{_epoch_prefix}%{version}-%{release}
 Requires:       ceph-mds = %{_epoch_prefix}%{version}-%{release}
-%if %fixme
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-%endif
 Requires:       ceph-mon = %{_epoch_prefix}%{version}-%{release}
 Requires(post):	binutils
 %if 0%{with cephfs_java}
@@ -143,16 +134,16 @@ BuildRequires:	selinux-policy-doc
 %endif
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
-BuildRequires: python%{_pythonver}-cherrypy
-BuildRequires: python%{_pythonver}-werkzeug
+BuildRequires: python-cherrypy
+BuildRequires: python-werkzeug
 %endif
 %if 0%{?suse_version}
 BuildRequires: python-CherryPy
 BuildRequires: python-Werkzeug
 BuildRequires: python-numpy-devel
 %endif
-BuildRequires: python%{_pythonver}-coverage
-BuildRequires: python%{_pythonver}-pecan
+BuildRequires:  python-coverage
+BuildRequires: python-pecan
 BuildRequires: socat
 %endif
 BuildRequires:	bc
@@ -163,13 +154,8 @@ BuildRequires:	fuse-devel
 BuildRequires:	gcc-c++
 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
@@ -182,12 +168,12 @@ BuildRequires:	make
 BuildRequires:	parted
 BuildRequires:	perl
 BuildRequires:	pkgconfig
-BuildRequires:	python%{_pythonver}
-BuildRequires:	python%{_pythonver}-devel
-BuildRequires:	python%{_pythonver}-nose
-BuildRequires:	python%{_pythonver}-requests
-BuildRequires:	python%{_pythonver}-six
-BuildRequires:	python%{_pythonver}-virtualenv
+BuildRequires:	python
+BuildRequires:	python2-devel
+BuildRequires:	python-nose
+BuildRequires:	python-requests
+BuildRequires:	python-six
+BuildRequires:	python-virtualenv
 BuildRequires:	snappy-devel
 BuildRequires:	udev
 BuildRequires:	util-linux
@@ -223,7 +209,7 @@ BuildRequires:  rdma-core-devel
 %if 0%{?fedora} || 0%{?rhel}
 Requires:	systemd
 BuildRequires:  boost-random
-BuildRequires:	boost-devel
+BuildRequires:	btrfs-progs
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 # RDMA is no longer built on 32-bit ARM: see #1484155
@@ -233,8 +219,9 @@ BuildRequires:	rdma-core-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  redhat-lsb-core
-BuildRequires:	python%{_pythonver}-prettytable
-BuildRequires:	python%{_pythonver}-sphinx
+BuildRequires:	Cython
+BuildRequires:	python-prettytable
+BuildRequires:	python-sphinx
 %endif
 # python34-... for RHEL, python3-... for all other supported distros
 %if ( 0%{?rhel} && 0%{?rhel} <= 7 )
@@ -242,9 +229,9 @@ BuildRequires:	python34-devel
 BuildRequires:	python34-setuptools
 BuildRequires:	python34-Cython
 %else
-BuildRequires:	python%{_pythonver}-devel
-BuildRequires:	python%{_pythonver}-setuptools
-BuildRequires:	python%{_pythonver}-Cython
+BuildRequires:	python3-devel
+BuildRequires:	python3-setuptools
+BuildRequires:	python3-Cython
 %endif
 # lttng and babeltrace for rbd-replay-prep
 %if %{with lttng}
@@ -291,25 +278,35 @@ Requires:      ceph-selinux = %{_epoch_prefix}%{version}-%{release}
 %endif
 Requires(post):/sbin/ldconfig
 Requires(postun):/sbin/ldconfig
-Requires:      python%{_pythonver}
-Requires:      python%{_pythonver}-requests
-Requires:      python%{_pythonver}-setuptools
+Requires:      python
+Requires:      python-requests
+Requires:      python-setuptools
 Requires:      grep
 Requires:      xfsprogs
 Requires:      e2fsprogs
 Requires:      logrotate
+Requires:      parted
 Requires:      util-linux
 Requires:      cryptsetup
 Requires:      findutils
 Requires:      psmisc
 Requires:      which
+%if 0%{?fedora} || 0%{?rhel}
+Requires:      gdisk
+# 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
+%endif
+%endif
 %if 0%{?suse_version}
 Recommends:    ntp-daemon
+Requires:      gptfdisk
 %endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 
-%package common
+%package -n ceph-common
 Summary:	Ceph Common
 %if 0%{?suse_version}
 Group:		System/Filesystems
@@ -317,22 +314,22 @@ Group:		System/Filesystems
 Requires:	librbd1 = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 Requires:	libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rados = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rbd = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-cephfs = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rgw = %{_epoch_prefix}%{version}-%{release}
+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}
 %if 0%{?fedora} || 0%{?rhel}
-Requires:	python%{_pythonver}-prettytable
+Requires:	python-prettytable
 %endif
 %if 0%{?suse_version}
 Requires:	python-PrettyTable
 %endif
-Requires:	python%{_pythonver}-requests
+Requires:	python-requests
 %{?systemd_requires}
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
 %endif
-%description common
+%description -n ceph-common
 Common utilities to mount and interact with a ceph storage cluster.
 Comprised of files that are common to Ceph clients and servers.
 
@@ -342,7 +339,7 @@ Summary:	Ceph Metadata Server Daemon
 Group:		System/Filesystems
 %endif
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-six
+Requires:	python-six
 %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
@@ -356,7 +353,7 @@ Group:		System/Filesystems
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 # For ceph-rest-api
 %if 0%{?fedora} || 0%{?rhel}
-Requires:      python%{_pythonver}-flask
+Requires:      python-flask
 %endif
 %if 0%{?suse_version}
 Requires:      python-Flask
@@ -367,7 +364,6 @@ system. One or more instances of ceph-mon form a Paxos part-time
 parliament cluster that provides extremely reliable and durable storage
 of cluster membership, configuration, and state.
 
-%if %fixme
 %package mgr
 Summary:        Ceph Manager Daemon
 %if 0%{?suse_version}
@@ -375,10 +371,10 @@ Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel}
-Requires:       python%{_pythonver}-cherrypy
-Requires:       python%{_pythonver}-jinja2
-Requires:       python%{_pythonver}-werkzeug
-Requires:       python%{_pythonver}-pyOpenSSL
+Requires:       python-cherrypy
+Requires:       python-jinja2
+Requires:       python-werkzeug
+Requires:       pyOpenSSL
 %endif
 %if 0%{?suse_version}
 Requires:       python-CherryPy
@@ -386,13 +382,12 @@ Requires:       python-jinja2
 Requires:       python-Werkzeug
 Requires:       python-pyOpenSSL
 %endif
-Requires:       python%{_pythonver}-pecan
+Requires:       python-pecan
 %description mgr
 ceph-mgr enables python modules that provide services (such as the REST
 module derived from Calamari) and expose CLI hooks.  ceph-mgr gathers
 the cluster maps, the daemon metadata, and performance counters, and
 exposes all these to the python modules.
-%endif
 
 %package fuse
 Summary:	Ceph fuse-based client
@@ -418,7 +413,7 @@ Summary:	Ceph daemon for mirroring RBD images
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 %description -n rbd-mirror
 Daemon for mirroring RBD images between Ceph clusters, streaming
@@ -439,7 +434,7 @@ Summary:	Rados REST gateway
 %if 0%{?suse_version}
 Group:		System/Filesystems
 %endif
-Requires:	ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
 %if 0%{with selinux}
 Requires:	ceph-selinux = %{_epoch_prefix}%{version}-%{release}
 %endif
@@ -474,14 +469,6 @@ Summary:	Ceph Object Storage Daemon
 Group:		System/Filesystems
 %endif
 Requires:	ceph-base = %{_epoch_prefix}%{version}-%{release}
-# for sgdisk, used by ceph-disk
-%if 0%{?fedora} || 0%{?rhel}
-Requires:	gdisk
-%endif
-%if 0%{?suse_version}
-Requires:	gptfdisk
-%endif
-Requires:       parted
 Requires:       lvm2
 %description osd
 ceph-osd is the object storage daemon for the Ceph distributed file
@@ -539,7 +526,6 @@ Obsoletes:	librgw2-devel < %{_epoch_prefix}%{version}-%{release}
 This package contains libraries and headers needed to develop programs
 that use RADOS gateway client library.
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %package -n python-rgw
 Summary:	Python 2 libraries for the RADOS gateway
 %if 0%{?suse_version}
@@ -551,7 +537,6 @@ 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
@@ -559,12 +544,11 @@ Summary:	Python 3 libraries for the RADOS gateway
 Group:		Development/Languages/Python
 %endif
 Requires:	librgw2 = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rados = %{_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%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %package -n python-rados
 Summary:	Python 2 libraries for the RADOS object store
 %if 0%{?suse_version}
@@ -575,14 +559,13 @@ 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
 %if 0%{?suse_version}
 Group:		Development/Languages/Python
 %endif
-Requires:	python%{_pythonver}
+Requires:	python%{python3_pkgversion}
 Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 %description -n python%{python3_pkgversion}-rados
 This package contains Python 3 libraries for interacting with Cephs RADOS
@@ -646,7 +629,6 @@ Obsoletes:	librbd1-devel < %{_epoch_prefix}%{version}-%{release}
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %package -n python-rbd
 Summary:	Python 2 libraries for the RADOS block device
 %if 0%{?suse_version}
@@ -658,7 +640,6 @@ 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
@@ -666,7 +647,7 @@ Summary:	Python 3 libraries for the RADOS block device
 Group:		Development/Languages/Python
 %endif
 Requires:	librbd1 = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rados = %{_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.
@@ -702,7 +683,6 @@ Obsoletes:	libcephfs2-devel < %{_epoch_prefix}%{version}-%{release}
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %package -n python-cephfs
 Summary:	Python 2 libraries for Ceph distributed file system
 %if 0%{?suse_version}
@@ -716,7 +696,6 @@ 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
@@ -724,7 +703,7 @@ Summary:	Python 3 libraries for Ceph distributed file system
 Group:		Development/Languages/Python
 %endif
 Requires:	libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires:	python%{_pythonver}-rados = %{_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.
@@ -822,7 +801,6 @@ populated file-systems.
 
 %endif
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %package -n python-ceph-compat
 Summary:	Compatibility package for Cephs python libraries
 %if 0%{?suse_version}
@@ -839,7 +817,6 @@ This is a compatibility package to accommodate python-ceph split into
 python-rados, python-rbd, python-rgw and python-cephfs. Packages still
 depending on python-ceph should be fixed to depend on python-rados,
 python-rbd, python-rgw or python-cephfs instead.
-%endif
 
 #################################################################################
 # common
@@ -897,17 +874,9 @@ cmake .. \
     -DCMAKE_INSTALL_MANDIR=%{_mandir} \
     -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
     -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-    -DWITH_MGR=OFF \
-    -DWITH_EMBEDDED=OFF \
     -DWITH_MANPAGE=ON \
     -DWITH_PYTHON3=ON \
     -DWITH_SYSTEMD=ON \
-    -DWITH_SYSTEM_BOOST=ON \
-    -DWITH_SPDK=OFF \
-    -DWITH_PMEM=OFF \
-    -DWITH_BLUESTORE=OFF \
-    -DWITH_BOOST_CONTEXT=OFF \
-    -DWITH_LEVELDB=OFF \
 %if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
     -DWITH_SUBMAN=ON \
 %endif
@@ -932,15 +901,17 @@ cmake .. \
     -DWITH_OCF=ON \
 %endif
 %ifarch aarch64 armv7hl mips mipsel ppc ppc64 ppc64le %{ix86} x86_64
-    -DWITH_RADOSGW_BEAST_FRONTEND=ON \
+    -DWITH_BOOST_CONTEXT=ON \
 %else
-    -DWITH_RADOSGW_BEAST_FRONTEND=OFF \
+    -DWITH_BOOST_CONTEXT=OFF \
 %endif
 %ifnarch %{arm}
     -DWITH_RDMA=OFF \
 %endif
     -DBOOST_J=%{_smp_ncpus}
 
+export VERBOSE=1
+export V=1
 make %{?_smp_mflags}
 
 
@@ -989,10 +960,6 @@ 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
 
-# %fixme
-rm -f %{buildroot}%{_unitdir}/ceph-mgr@.service
-rm -f %{buildroot}%{_unitdir}/ceph-mgr.target
-
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
 mkdir -p %{buildroot}%{_rundir}/ceph
@@ -1025,12 +992,10 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
 %{_bindir}/osdmaptool
 %{_bindir}/ceph-kvstore-tool
 %{_bindir}/ceph-run
-%if %fixme
 %{_bindir}/ceph-detect-init
-%{_bindir}/ceph-disk
-%endif
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
+%{_sbindir}/ceph-disk
 %{_sbindir}/rcceph
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
@@ -1060,13 +1025,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
 %endif
 %{_unitdir}/ceph-disk@.service
 %{_unitdir}/ceph.target
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %{python2_sitelib}/ceph_detect_init*
 %{python2_sitelib}/ceph_disk*
 %dir %{python_sitelib}/ceph_volume
 %{python2_sitelib}/ceph_volume/*
 %{python2_sitelib}/ceph_volume-*
-%endif
 %{_mandir}/man8/ceph-deploy.8*
 %{_mandir}/man8/ceph-detect-init.8*
 %{_mandir}/man8/ceph-create-keys.8*
@@ -1183,10 +1146,8 @@ fi
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %{_unitdir}/rbdmap.service
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %{python2_sitelib}/ceph_argparse.py*
 %{python2_sitelib}/ceph_daemon.py*
-%endif
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/50-rbd.rules
 %attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
@@ -1277,7 +1238,6 @@ if [ $FIRST_ARG -ge 1 ] ; then
   fi
 fi
 
-%if %fixme
 %files mgr
 %{_bindir}/ceph-mgr
 %{_libdir}/ceph/mgr
@@ -1326,7 +1286,6 @@ if [ $FIRST_ARG -ge 1 ] ; then
     /usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || :
   fi
 fi
-%endif
 
 %files mon
 %{_bindir}/ceph-mon
@@ -1334,12 +1293,7 @@ fi
 %{_bindir}/ceph-monstore-tool
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-rest-api.8*
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %{python2_sitelib}/ceph_rest_api.py*
-%else
-%{python3_sitelib}/ceph_rest_api.py*
-%{python3_sitelib}/__pycache__/*
-%endif
 %{_unitdir}/ceph-mon@.service
 %{_unitdir}/ceph-mon.target
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
@@ -1508,10 +1462,8 @@ fi
 %{_bindir}/ceph-osdomap-tool
 %{_bindir}/ceph-osd
 %{_libexecdir}/ceph/ceph-osd-prestart.sh
-%if %fixme
 %{_sbindir}/ceph-volume
 %{_sbindir}/ceph-volume-systemd
-%endif
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
 %{_udevrulesdir}/95-ceph-osd.rules
@@ -1616,11 +1568,9 @@ fi
 %{_bindir}/librados-config
 %{_mandir}/man8/librados-config.8*
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %files -n python-rados
 %{python2_sitearch}/rados.so
 %{python2_sitearch}/rados-*.egg-info
-%endif
 
 %files -n python%{python3_pkgversion}-rados
 %{python3_sitearch}/rados.cpython*.so
@@ -1663,21 +1613,17 @@ fi
 %{_includedir}/rados/rgw_file.h
 %{_libdir}/librgw.so
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %files -n python-rgw
 %{python2_sitearch}/rgw.so
 %{python2_sitearch}/rgw-*.egg-info
-%endif
 
 %files -n python%{python3_pkgversion}-rgw
 %{python3_sitearch}/rgw.cpython*.so
 %{python3_sitearch}/rgw-*.egg-info
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %files -n python-rbd
 %{python2_sitearch}/rbd.so
 %{python2_sitearch}/rbd-*.egg-info
-%endif
 
 %files -n python%{python3_pkgversion}-rbd
 %{python3_sitearch}/rbd.cpython*.so
@@ -1693,12 +1639,10 @@ fi
 %{_includedir}/cephfs/ceph_statx.h
 %{_libdir}/libcephfs.so
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %files -n python-cephfs
 %{python2_sitearch}/cephfs.so
 %{python2_sitearch}/cephfs-*.egg-info
 %{python2_sitelib}/ceph_volume_client.py*
-%endif
 
 %files -n python%{python3_pkgversion}-cephfs
 %{python3_sitearch}/cephfs.cpython*.so
@@ -1855,39 +1799,33 @@ exit 0
 
 %endif # with selinux
 
-%if ( 0%{?fedora} && 0%{?fedora} < 30) || ( 0%{?rhel} && 0%{?rhel} < 8)
 %files -n python-ceph-compat
 # We need an empty %%files list for python-ceph-compat, to tell rpmbuild to
 # actually build this meta package.
-%endif
 
 
 %changelog
+* Fri Apr 12 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.12-1
+- New release (1:12.2.12-1)
+
+* Fri Feb 1 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.11-1
+- New release (1:12.2.11-1)
+
+* Fri Dec 7 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.10-1
+- New release (1:12.2.10-1)
+
 * Mon Oct 29 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.9-1
 - New release (1:12.2.9-1)
 
-* Wed Sep 12 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.8-2
-- Fedora 30 python3. Note ceph-mgr subpackage, ceph-detect-init, ceph-disk,
-  ceph-volume, and ceph-volume-systemd are missing in this build
-
 * Fri Aug 31 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.8-1
 - New release (1:12.2.8-1)
 
 * Wed Jul 18 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.7-1
 - New release (1:12.2.7-1)
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Wed Jul 11 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.6-1
 - New release (1:12.2.6-1)
 
-* Mon Jul 2 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.5-3
-- New release (1:12.2.5-3) w/ python-3.7
-
-* Fri Jun 29 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.5-2
-- New release (1:12.2.5-2)
-
 * Fri Apr 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.5-1
 - New release (1:12.2.5-1)
 

sources

@@ -1 +1 @@
-SHA512 (ceph-12.2.9.tar.gz) = 93da6f9012fdb65e74dc1917f54839cb19a25672d53e7ee253553e93abb1a2afb51cd18b27bc82559108e2085e463a3b46003b03627e06a6e2e2312b54d86e92
+SHA512 (ceph-12.2.12.tar.gz) = e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc