The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=a384bd12380f8....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 8fba3c40476de5378141ecae9bc42ce89bbcba3a
Merge: 384d883 16a5d9d
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Feb 3 00:35:00 2020 -0500
Merge remote-tracking branch 'origin' into f31
commit 16a5d9d3655fcb5443a847c977c3c0c09069e38d
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Feb 3 00:29:46 2020 -0500
ceph 14.2.7 python3-remoto #1784216
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 9bcc914..8301f46 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -109,7 +109,7 @@
#################################################################################
Name: ceph
Version: 14.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -551,7 +551,7 @@ BuildArch: noarch
Group: System/Filesystems
%endif
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires: python-remoto
+Requires: python3-remoto
%description mgr-ssh
ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
direct SSH connections for management operations.
@@ -2268,6 +2268,9 @@ exit 0
%endif
%changelog
+* Mon Feb 3 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-2
+- ceph 14.2.7 python3-remoto #1784216
+
* Sat Feb 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-1
- ceph 14.2.7 GA
commit 384d883beb08941fcafb0f5ffccbde697ce9d878
Merge: ed755c5 b7bbd83
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Sat Feb 1 04:10:32 2020 -0500
ceph 14.2.7 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --cc ceph.spec
index d9ded78,9bcc914..fee4692
--- a/ceph.spec
+++ b/ceph.spec
@@@ -2268,9 -2268,15 +2268,12 @@@ exit
%endif
%changelog
+ * Sat Feb 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-1
+ - ceph 14.2.7 GA
+
-* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
+* Thu Jan 30 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
- ceph 14.2.6,
https://tracker.ceph.com/issues/43649
-* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
-- ceph 14.2.6, (temporarily) disable unit tests
-
* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
- ceph 14.2.6, gcc-10, missing includes
commit b7bbd8375ef93a4e8a3c98bb5a1a31c9db2624f8
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Sat Feb 1 03:15:39 2020 -0500
ceph 14.2.7 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 199a167..9bcc914 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -108,8 +108,8 @@
# main package definition
#################################################################################
Name: ceph
-Version: 14.2.6
-Release: 4%{?dist}
+Version: 14.2.7
+Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -2268,6 +2268,9 @@ exit 0
%endif
%changelog
+* Sat Feb 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.7-1
+- ceph 14.2.7 GA
+
* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
- ceph 14.2.6,
https://tracker.ceph.com/issues/43649
diff --git a/sources b/sources
index 9e09d06..d574db2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-14.2.6.tar.gz) =
b864a228deb3f8ec64fd17ed1b56b7e100332b9f94109eb31bfe4af24d50a615671a4389f02148e55852df01e7cc965b2baf56624ea89192bda34d79223f97fe
+SHA512 (ceph-14.2.7.tar.gz) =
59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
commit ed755c553056620754e34b7d73281dea7e1d867a
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Jan 30 13:33:29 2020 -0500
ceph 14.2.6,
https://tracker.ceph.com/issues/43649
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 199a167..d9ded78 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -109,7 +109,7 @@
#################################################################################
Name: ceph
Version: 14.2.6
-Release: 4%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -1221,8 +1221,8 @@ make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
-# cd build
-# ctest "$CEPH_MFLAGS_JOBS"
+cd build
+ctest "$CEPH_MFLAGS_JOBS"
%endif
@@ -2268,12 +2268,9 @@ exit 0
%endif
%changelog
-* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
+* Thu Jan 30 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
- ceph 14.2.6,
https://tracker.ceph.com/issues/43649
-* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
-- ceph 14.2.6, (temporarily) disable unit tests
-
* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
- ceph 14.2.6, gcc-10, missing includes
commit 9ddd84af307d63e8c238cc45fd5c2986a9b8928d
Merge: 15e2388 7816ec5
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Jan 30 13:30:10 2020 -0500
Merge remote-tracking branch 'origin' into f31
commit 7816ec57834ae78884dfabdc7e1b5d853c6ac18f
Merge: e7d942d 2abb0a0
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Wed Jan 29 14:44:45 2020 -0500
ceph 14.2.6,
https://tracker.ceph.com/issues/43649
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
commit e7d942d1e681918252302fbcf3d1ea291e951ba9
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Wed Jan 29 14:43:21 2020 -0500
ceph 14.2.6,
https://tracker.ceph.com/issues/43649
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0005-mount.ceph-remove-arbitrary-limit-on-size-of-name-op.patch
b/0005-mount.ceph-remove-arbitrary-limit-on-size-of-name-op.patch
new file mode 100644
index 0000000..3d951ea
--- /dev/null
+++ b/0005-mount.ceph-remove-arbitrary-limit-on-size-of-name-op.patch
@@ -0,0 +1,135 @@
+From 8db2a44c9438749be98d41fb309f10d5084805df Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton(a)redhat.com>
+Date: Fri, 17 Jan 2020 07:48:12 -0500
+Subject: [PATCH] mount.ceph: remove arbitrary limit on size of name= option
+
+Aaron was getting back -ERANGE errors when trying to mount using
+a long name= option. The issue is that the destination buffer for the
+"key=" string is not big enough to hold long names.
+
+When I overhauled the mount.ceph code recently, I made this buffer much
+smaller than before figuring that it didn't need to be any larger than
+the length of "secret=<base64 encoded key>".
+
+In the case where the secret is set in the keyring though, this buffer
+needs to be able to hold a string like "key=client.<cephx name>". The
+cephx name can be of arbitrary length, however.
+
+Rework the code to just safe_cat the strings directly into the options
+buffer, eliminating an extra copy and the need for an arbitrary limit.
+This also allows us to remove get_secret_option() from the the common
+code as well.
+
+Fixes:
https://tracker.ceph.com/issues/43649
+Reported-by: Aaron <aarongmldt(a)gmail.com>
+Signed-off-by: Jeff Layton <jlayton(a)redhat.com>
+---
+ src/common/secret.h | 7 ------
+ src/mount/mount.ceph.c | 45 ++++++++++++++++++++++++-------------
+ src/mount/mount.ceph.h | 3 ---
+ 4 files changed, 30 insertions(+), 75 deletions(-)
+
+diff --git a/src/common/secret.h b/src/common/secret.h
+index b681fa1ec7..5d2ad179dd 100644
+--- a/src/common/secret.h
++++ b/src/common/secret.h
+@@ -7,13 +7,6 @@ extern "C" {
+
+ int read_secret_from_file(const char *filename, char *secret, size_t max_len);
+
+-/*
+- * Attempts to add the secret to the kernel, but falls back to
+- * the old secret= option if the kernel is too old.
+- */
+-int get_secret_option(const char *secret, const char *key_name,
+- char *secret_option, size_t secret_option_len);
+-
+ int set_kernel_secret(const char *secret, const char *key_name);
+
+ int is_kernel_secret(const char *key_name);
+diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c
+index e970648c59..133bc554f5 100644
+--- a/src/mount/mount.ceph.c
++++ b/src/mount/mount.ceph.c
+@@ -425,24 +425,39 @@ static void ceph_mount_info_free(struct ceph_mount_info *cmi)
+ free(cmi->cmi_conf);
+ }
+
+-static int finalize_options(struct ceph_mount_info *cmi)
++static int append_key_or_secret_option(struct ceph_mount_info *cmi)
+ {
+- int pos;
++ int pos = strlen(cmi->cmi_opts);
+
+- if (cmi->cmi_secret[0] || is_kernel_secret(cmi->cmi_name)) {
+- int ret;
+- char secret_option[SECRET_OPTION_BUFSIZE];
++ if (!cmi->cmi_secret[0] && !is_kernel_secret(cmi->cmi_name))
++ return 0;
+
+- ret = get_secret_option(cmi->cmi_secret, cmi->cmi_name,
+- secret_option, sizeof(secret_option));
+- if (ret < 0)
++ if (pos)
++ pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, ",");
++
++ /* when parsing kernel options (-o remount) we get '<hidden>' as the
secret */
++ if (cmi->cmi_secret[0] && (strcmp(cmi->cmi_secret,
"<hidden>") != 0)) {
++ int ret = set_kernel_secret(cmi->cmi_secret, cmi->cmi_name);
++ if (ret < 0) {
++ if (ret == -ENODEV || ret == -ENOSYS) {
++ /* old kernel; fall back to secret= in options */
++ pos = safe_cat(&cmi->cmi_opts,
++ &cmi->cmi_opts_len, pos,
++ "secret=");
++ pos = safe_cat(&cmi->cmi_opts,
++ &cmi->cmi_opts_len, pos,
++ cmi->cmi_secret);
++ return 0;
++ }
++ fprintf(stderr, "adding ceph secret key to kernel failed: %s\n",
++ strerror(-ret));
+ return ret;
+-
+- pos = strlen(cmi->cmi_opts);
+- if (pos)
+- pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos,
",");
+- pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos, secret_option);
++ }
+ }
++
++ pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos,
"key=");
++ pos = safe_cat(&cmi->cmi_opts, &cmi->cmi_opts_len, pos,
cmi->cmi_name);
++
+ return 0;
+ }
+
+@@ -493,9 +508,9 @@ int main(int argc, char *argv[])
+ /* Ensure the ceph key_type is available */
+ modprobe();
+
+- retval = finalize_options(&cmi);
++ retval = append_key_or_secret_option(&cmi);
+ if (retval) {
+- fprintf(stderr, "couldn't finalize options: %d\n", retval);
++ fprintf(stderr, "couldn't append secret option: %d\n", retval);
+ retval = EX_USAGE;
+ goto out;
+ }
+diff --git a/src/mount/mount.ceph.h b/src/mount/mount.ceph.h
+index c563597c43..b61176923d 100644
+--- a/src/mount/mount.ceph.h
++++ b/src/mount/mount.ceph.h
+@@ -21,9 +21,6 @@ extern "C" {
+ /* Max Including null terminator */
+ #define SECRET_BUFSIZE (MAX_SECRET_LEN + 1)
+
+-/* Buffer size for secret= option */
+-#define SECRET_OPTION_BUFSIZE (sizeof("secret=") + MAX_SECRET_LEN + 1)
+-
+ /* 2k should be enough for anyone? */
+ #define MON_LIST_BUFSIZE 2048
+
+--
+2.24.1
+
diff --git a/ceph.spec b/ceph.spec
index 5b313f1..199a167 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -2269,7 +2269,7 @@ exit 0
%changelog
* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
-- ceph 14.2.6, mount option
+- ceph 14.2.6,
https://tracker.ceph.com/issues/43649
* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
- ceph 14.2.6, (temporarily) disable unit tests
commit e559532d4b18ed05a613be09b72218f16b7eb611
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Jan 27 12:04:37 2020 -0500
ceph 14.2.6, (temporarily) disable unit tests
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index e682749..5b313f1 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,7 +26,7 @@
%global _hardened_build 1
%bcond_without ocf
-%bcond_without make_check
+%bcond_with make_check
%bcond_without ceph_test_package
%ifarch s390 s390x
%bcond_with tcmalloc
@@ -109,7 +109,7 @@
#################################################################################
Name: ceph
Version: 14.2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -128,6 +128,7 @@ Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz
Patch002: 0002-src-common-CMakeLists.txt.patch
Patch003: 0003-src-common-bitstr.h.patch
Patch004: 0004-src-librbd-api-PoolMetadata.h.patch
+Patch005: 0005-mount.ceph-remove-arbitrary-limit-on-size-of-name-op.patch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl
#################################################################################
@@ -1220,8 +1221,8 @@ make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
-cd build
-ctest "$CEPH_MFLAGS_JOBS"
+# cd build
+# ctest "$CEPH_MFLAGS_JOBS"
%endif
@@ -2267,6 +2268,12 @@ exit 0
%endif
%changelog
+* Wed Jan 29 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-4
+- ceph 14.2.6, mount option
+
+* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
+- ceph 14.2.6, (temporarily) disable unit tests
+
* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
- ceph 14.2.6, gcc-10, missing includes
commit 2abb0a0f7c5855b1679c37aca442bb7515a3f14d
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Jan 27 12:04:37 2020 -0500
ceph 14.2.6, (temporarily) disable unit tests
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index e682749..32bc24e 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,7 +26,7 @@
%global _hardened_build 1
%bcond_without ocf
-%bcond_without make_check
+%bcond_with make_check
%bcond_without ceph_test_package
%ifarch s390 s390x
%bcond_with tcmalloc
@@ -1220,8 +1220,8 @@ make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
-cd build
-ctest "$CEPH_MFLAGS_JOBS"
+# cd build
+# ctest "$CEPH_MFLAGS_JOBS"
%endif
@@ -2267,6 +2267,9 @@ exit 0
%endif
%changelog
+* Mon Jan 27 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-3
+- ceph 14.2.6, (temporarily) disable unit tests
+
* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
- ceph 14.2.6, gcc-10, missing includes
commit ce8aeac3f16148f3dba8bee3f939ce44d1d5faec
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Jan 27 10:33:25 2020 -0500
ceph-14.2.6, missing includes
diff --git a/0003-src-common-bitstr.h.patch b/0003-src-common-bitstr.h.patch
new file mode 100644
index 0000000..612f4fe
--- /dev/null
+++ b/0003-src-common-bitstr.h.patch
@@ -0,0 +1,13 @@
+--- ceph-14.2.6/src/common/bit_str.h.orig 2020-01-24 11:37:20.547679336 -0500
++++ ceph-14.2.6/src/common/bit_str.h 2020-01-24 11:37:55.351904895 -0500
+@@ -14,7 +14,10 @@
+ #ifndef CEPH_COMMON_BIT_STR_H
+ #define CEPH_COMMON_BIT_STR_H
+
++#include <cstdint>
++#include <iosfwd>
+ #include <functional>
++#include <ostream>
+
+ namespace ceph {
+ class Formatter;
diff --git a/0004-src-librbd-api-PoolMetadata.h.patch
b/0004-src-librbd-api-PoolMetadata.h.patch
new file mode 100644
index 0000000..98f9b63
--- /dev/null
+++ b/0004-src-librbd-api-PoolMetadata.h.patch
@@ -0,0 +1,10 @@
+--- ceph-14.2.6/src/librbd/api/PoolMetadata.h.orig 2020-01-24 12:39:23.738816885 -0500
++++ ceph-14.2.6/src/librbd/api/PoolMetadata.h 2020-01-24 12:39:36.522902386 -0500
+@@ -8,6 +8,7 @@
+ #include "include/rados/librados_fwd.hpp"
+
+ #include <map>
++#include <string>
+
+ namespace librbd {
+
diff --git a/ceph.spec b/ceph.spec
index 553a53a..e682749 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -26,7 +26,7 @@
%global _hardened_build 1
%bcond_without ocf
-%bcond_with make_check
+%bcond_without make_check
%bcond_without ceph_test_package
%ifarch s390 s390x
%bcond_with tcmalloc
@@ -109,7 +109,7 @@
#################################################################################
Name: ceph
Version: 14.2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -126,6 +126,8 @@ Group: System/Filesystems
URL:
http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz
Patch002: 0002-src-common-CMakeLists.txt.patch
+Patch003: 0003-src-common-bitstr.h.patch
+Patch004: 0004-src-librbd-api-PoolMetadata.h.patch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl
#################################################################################
@@ -2265,6 +2267,9 @@ exit 0
%endif
%changelog
+* Fri Jan 24 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- ceph 14.2.6, gcc-10, missing includes
+
* Thu Jan 9 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-2
- ceph 14.2.6
commit 15e2388df38ff1f4520cbb27f3516a1e30075b4d
Merge: 8f6e84e c5f0288
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Sun Jan 12 07:23:43 2020 -0500
Merge remote-tracking branch 'origin' into f31
commit c5f02885fe6abdf41bea3c8e43bd8a0175fe6cce
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Sun Jan 12 07:22:50 2020 -0500
ceph 14.2.6
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 995dd68..553a53a 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -109,9 +109,9 @@
#################################################################################
Name: ceph
Version: 14.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
-Epoch: 1
+Epoch: 2
%endif
# define _epoch_prefix macro which will expand to the empty string if epoch is
@@ -2265,6 +2265,9 @@ exit 0
%endif
%changelog
+* Thu Jan 9 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-2
+- ceph 14.2.6
+
* Thu Jan 9 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-1
- ceph 14.2.6 GA
commit 8f6e84efec98c88d4a9ecaaa80c44b41c4dafb01
Merge: 3343bdb 0bbc5f8
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Jan 9 09:37:47 2020 -0500
Merge remote-tracking branch 'origin' into f31
commit 0bbc5f85a731441cc9e7676f8009a13eb1b168a6
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Thu Jan 9 09:03:01 2020 -0500
ceph 14.2.6 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index aea5e00..995dd68 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -108,10 +108,10 @@
# main package definition
#################################################################################
Name: ceph
-Version: 14.2.5
+Version: 14.2.6
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
-Epoch: 2
+Epoch: 1
%endif
# define _epoch_prefix macro which will expand to the empty string if epoch is
@@ -2265,6 +2265,9 @@ exit 0
%endif
%changelog
+* Thu Jan 9 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.6-1
+- ceph 14.2.6 GA
+
* Tue Dec 10 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.5-1
- ceph 14.2.5 GA
diff --git a/sources b/sources
index 3c8c5c7..9e09d06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-14.2.5.tar.gz) =
38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b
+SHA512 (ceph-14.2.6.tar.gz) =
b864a228deb3f8ec64fd17ed1b56b7e100332b9f94109eb31bfe4af24d50a615671a4389f02148e55852df01e7cc965b2baf56624ea89192bda34d79223f97fe
commit 3343bdbb0162e1621e3c549ec1448ea2e265c8b2
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Dec 10 15:12:49 2019 -0500
ceph 14.2.5 GA
diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch
deleted file mode 100644
index 951a487..0000000
--- a/0001-s390x-A-compile-hack.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 94db732128bdeec330f7353f2514940bc1abd97b Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Thu, 28 Feb 2019 00:58:12 +0100
-Subject: [PATCH] s390x: A compile hack
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
- src/test/rgw/test_rgw_dmclock_scheduler.cc | 7 ++++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc
b/src/rgw/rgw_dmclock_async_scheduler.cc
-index 18ba5a5e32..08657cf2b5 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.cc
-+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
-@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
- const Time& time, const Cost& cost,
- optional_yield yield_ctx)
- {
-+#ifdef HAVE_BOOST_CONTEXT
- ceph_assert(yield_ctx);
-
- auto &yield = yield_ctx.get_yield_context();
-@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
- else
- return -ec.value();
- }
-+#endif
-
- return 0;
- }
-diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc
b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-index 7d2ef9b328..e09f727972 100644
---- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
-+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-@@ -14,6 +14,8 @@
-
- //#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
-
-+#ifdef HAVE_BOOST_CONTEXT
-+
- #include "rgw/rgw_dmclock_sync_scheduler.h"
- #include "rgw/rgw_dmclock_async_scheduler.h"
-
-@@ -76,7 +78,6 @@ TEST(Queue, SyncRequest)
- EXPECT_EQ(0u, counters(client_id::auth)->get(queue_counters::l_cancel));
- }
-
--#ifdef HAVE_BOOST_CONTEXT
- TEST(Queue, RateLimit)
- {
- boost::asio::io_context context;
-@@ -426,6 +427,6 @@ TEST(Queue, SpawnAsyncRequest)
- EXPECT_TRUE(context.stopped());
- }
-
--#endif
--
- } // namespace rgw::dmclock
-+
-+#endif
---
-2.20.1
-
commit b0cac5e9363f97ac8be74f8d9775d5ebc88d61e0
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Dec 10 15:12:02 2019 -0500
ceph 14.2.5 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0001-s390x-A-compile-hack.patch b/0001-s390x-A-compile-hack.patch
deleted file mode 100644
index 951a487..0000000
--- a/0001-s390x-A-compile-hack.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 94db732128bdeec330f7353f2514940bc1abd97b Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Thu, 28 Feb 2019 00:58:12 +0100
-Subject: [PATCH] s390x: A compile hack
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- src/rgw/rgw_dmclock_async_scheduler.cc | 2 ++
- src/test/rgw/test_rgw_dmclock_scheduler.cc | 7 ++++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/rgw/rgw_dmclock_async_scheduler.cc
b/src/rgw/rgw_dmclock_async_scheduler.cc
-index 18ba5a5e32..08657cf2b5 100644
---- a/src/rgw/rgw_dmclock_async_scheduler.cc
-+++ b/src/rgw/rgw_dmclock_async_scheduler.cc
-@@ -41,6 +41,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
- const Time& time, const Cost& cost,
- optional_yield yield_ctx)
- {
-+#ifdef HAVE_BOOST_CONTEXT
- ceph_assert(yield_ctx);
-
- auto &yield = yield_ctx.get_yield_context();
-@@ -53,6 +54,7 @@ int AsyncScheduler::schedule_request_impl(const client_id& client,
- else
- return -ec.value();
- }
-+#endif
-
- return 0;
- }
-diff --git a/src/test/rgw/test_rgw_dmclock_scheduler.cc
b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-index 7d2ef9b328..e09f727972 100644
---- a/src/test/rgw/test_rgw_dmclock_scheduler.cc
-+++ b/src/test/rgw/test_rgw_dmclock_scheduler.cc
-@@ -14,6 +14,8 @@
-
- //#define BOOST_ASIO_ENABLE_HANDLER_TRACKING
-
-+#ifdef HAVE_BOOST_CONTEXT
-+
- #include "rgw/rgw_dmclock_sync_scheduler.h"
- #include "rgw/rgw_dmclock_async_scheduler.h"
-
-@@ -76,7 +78,6 @@ TEST(Queue, SyncRequest)
- EXPECT_EQ(0u, counters(client_id::auth)->get(queue_counters::l_cancel));
- }
-
--#ifdef HAVE_BOOST_CONTEXT
- TEST(Queue, RateLimit)
- {
- boost::asio::io_context context;
-@@ -426,6 +427,6 @@ TEST(Queue, SpawnAsyncRequest)
- EXPECT_TRUE(context.stopped());
- }
-
--#endif
--
- } // namespace rgw::dmclock
-+
-+#endif
---
-2.20.1
-
commit a384bd12380f80316385639a82428fef760437b9
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Dec 10 10:21:50 2019 -0500
ceph 14.2.5 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 85925e0..aea5e00 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -27,6 +27,7 @@
%bcond_without ocf
%bcond_with make_check
+%bcond_without ceph_test_package
%ifarch s390 s390x
%bcond_with tcmalloc
%else
@@ -44,7 +45,6 @@
%endif
%if 0%{?suse_version}
%bcond_with selinux
-%bcond_with ceph_test_package
%bcond_with cephfs_java
%bcond_with amqp_endpoint
#Compat macro for new _fillupdir macro introduced in Nov 2017
@@ -92,6 +92,7 @@
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3}
+%{!?python3_version_nodots: %global python3_version_nodots 3}
%{!?python3_version: %global python3_version 3}
# define _python_buildid macro which will expand to the empty string when
# building with python2
@@ -107,8 +108,8 @@
# main package definition
#################################################################################
Name: ceph
-Version: 14.2.4
-Release: 3%{?dist}
+Version: 14.2.5
+Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -124,7 +125,6 @@ Group: System/Filesystems
%endif
URL:
http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz
-Patch001: 0001-s390x-A-compile-hack.patch
Patch002: 0002-src-common-CMakeLists.txt.patch
# ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787
ExcludeArch: i686 armv7hl
@@ -155,7 +155,11 @@ BuildRequires: fuse-devel
%if 0%{?rhel} == 7
# devtoolset offers newer make and valgrind-devel, but the old ones are good
# enough.
+%ifarch x86_64
+BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1
+%else
BuildRequires: devtoolset-7-gcc-c++ >= 7.3.1-5.13
+%endif
%else
BuildRequires: gcc-c++
%endif
@@ -172,14 +176,16 @@ BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
+BuildRequires: libcap-ng-devel
BuildRequires: libudev-devel
+BuildRequires: libnl3-devel
BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
-BuildRequires: libuuid-devel
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: parted
+BuildRequires: patch
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: procps
@@ -198,6 +204,7 @@ BuildRequires: yasm
BuildRequires: librabbitmq-devel
%if 0%{with make_check}
BuildRequires: jq
+BuildRequires: libuuid-devel
BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-coverage
BuildRequires: python%{_python_buildid}-nose
@@ -228,6 +235,7 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
PreReq: %fillup_prereq
+BuildRequires: fdupes
BuildRequires: net-tools
BuildRequires: libbz2-devel
BuildRequires: mozilla-nss-devel
@@ -261,7 +269,11 @@ BuildRequires: CUnit-devel
BuildRequires: redhat-lsb-core
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
+%if 0%{?rhel}
+BuildRequires: python%{python3_version_nodots}-Cython
+%else
BuildRequires: python%{python3_pkgversion}-Cython
+%endif
BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7
@@ -442,6 +454,7 @@ 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-k8sevents = %{_epoch_prefix}%{version}-%{release}
Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
%endif
%description mgr
@@ -516,6 +529,18 @@ Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using
a Rook backend.
+%package mgr-k8sevents
+BuildArch: noarch
+Summary: Ceph Manager plugin to orchestrate ceph-events to kubernetes' events API
+%if 0%{?suse_version}
+Group: System/Filesystems
+%endif
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-kubernetes
+%description mgr-k8sevents
+ceph-mgr-k8sevents is a ceph-mgr plugin that sends every ceph-events
+to kubernetes' events API
+
%package mgr-ssh
Summary: ceph-mgr ssh module
BuildArch: noarch
@@ -688,6 +713,7 @@ Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python-rgw}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
Provides: python3-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{without python2}
@@ -706,6 +732,11 @@ Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-rgw}
+%if 0%{without python2}
+Provides: python-rgw = %{_epoch_prefix}%{version}-%{release}
+Obsoletes: python-rgw < %{_epoch_prefix}%{version}-%{release}
+%endif
%description -n python%{python3_pkgversion}-rgw
This package contains Python 3 libraries for interacting with Cephs RADOS
gateway.
@@ -717,6 +748,7 @@ Summary: Python 2 libraries for the RADOS object store
Group: Development/Libraries/Python
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python-rados}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rados
This package contains Python 2 libraries for interacting with Cephs RADOS
@@ -730,7 +762,7 @@ Group: Development/Libraries/Python
%endif
Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
-Provides: python3-rados = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-rados}
%if 0%{without python2}
Provides: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release}
@@ -808,6 +840,7 @@ Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python-rbd}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rbd
This package contains Python 2 libraries for interacting with Cephs RADOS
@@ -821,6 +854,7 @@ Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-rbd}
%if 0%{without python2}
Provides: python-rbd = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release}
@@ -868,6 +902,7 @@ Group: Development/Libraries/Python
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
Requires: python-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python-cephfs}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
@@ -882,7 +917,7 @@ Group: Development/Libraries/Python
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}
-Provides: python3-cephfs = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-cephfs}
%if 0%{without python2}
Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
@@ -909,7 +944,7 @@ Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
Group: Development/Libraries/Python
%endif
-Provides: python3-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-argparse}
%description -n python%{python3_pkgversion}-ceph-argparse
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
@@ -1065,7 +1100,7 @@ This package provides Cephs default alerts for Prometheus.
%define _lto_cflags %{nil}
%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
+. /opt/rh/devtoolset-8/enable
%endif
%if 0%{with cephfs_java}
@@ -1245,6 +1280,8 @@ mkdir -p
%{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
%py3_compile %{buildroot}%{python3_sitelib}
# prometheus alerts
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml
%{buildroot}/etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
+# hardlink duplicate files under /usr to save space
+%fdupes %{buildroot}%{_prefix}
%endif
%if 0%{?rhel} == 8
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
@@ -1628,6 +1665,19 @@ if [ $1 -eq 1 ] ; then
/usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
fi
+%files mgr-k8sevents
+%{_datadir}/ceph/mgr/k8sevents
+
+%post mgr-k8sevents
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-k8sevents
+if [ $1 -eq 1 ] ; then
+ /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
%files mgr-ssh
%{_datadir}/ceph/mgr/ssh
@@ -1891,6 +1941,7 @@ fi
%if %{with lttng}
%{_libdir}/librados_tp.so.*
%endif
+%dir %{_sysconfdir}/ceph
%post -n librados2 -p /sbin/ldconfig
@@ -1967,8 +2018,8 @@ fi
%{_libdir}/librgw.so.*
%{_libdir}/librgw_admin_user.so.*
%if %{with lttng}
-%{_libdir}/librgw_op_tp.so*
-%{_libdir}/librgw_rados_tp.so*
+%{_libdir}/librgw_op_tp.so.*
+%{_libdir}/librgw_rados_tp.so.*
%endif
%post -n librgw2 -p /sbin/ldconfig
@@ -1982,6 +2033,10 @@ fi
%{_includedir}/rados/rgw_file.h
%{_libdir}/librgw.so
%{_libdir}/librgw_admin_user.so
+%if %{with lttng}
+%{_libdir}/librgw_op_tp.so
+%{_libdir}/librgw_rados_tp.so
+%endif
%if 0%{with python2}
%files -n python-rgw
@@ -2005,6 +2060,7 @@ fi
%files -n libcephfs2
%{_libdir}/libcephfs.so.*
+%dir %{_sysconfdir}/ceph
%post -n libcephfs2 -p /sbin/ldconfig
@@ -2209,6 +2265,9 @@ exit 0
%endif
%changelog
+* Tue Dec 10 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.5-1
+- ceph 14.2.5 GA
+
* Mon Nov 11 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.4-3
- ceph 14.2.4, fix typo
diff --git a/sources b/sources
index c0d9443..3c8c5c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-14.2.4.tar.gz) =
dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0
+SHA512 (ceph-14.2.5.tar.gz) =
38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b
commit c7349cff7fd0ec25f114c405b693ebc0e0551678
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Mon Nov 11 06:26:36 2019 -0500
ceph 14.2.4, fix typo
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 2b15e52..85925e0 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -108,7 +108,7 @@
#################################################################################
Name: ceph
Version: 14.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -431,7 +431,7 @@ Requires: python%{_python_buildid}-six
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
Requires: python%{_python_buildid}-werkzeug
-Requires: python%{_python_buildid}-gprcio
+Requires: python%{_python_buildid}-grpcio
Requires: python%{_python_buildid}-protobuf
%endif
%if 0%{?suse_version}
@@ -2209,6 +2209,9 @@ exit 0
%endif
%changelog
+* Mon Nov 11 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.4-3
+- ceph 14.2.4, fix typo
+
* Tue Nov 5 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.4-2
- ceph 14.2.4, partial fix for bz#1768017
commit f706627b656fbc9e037283527df9ad2c5c586c09
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue Nov 5 10:23:06 2019 -0500
ceph 14.2.4, partial fix for bz#1768017
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/ceph.spec b/ceph.spec
index 36f78fa..2b15e52 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -108,7 +108,7 @@
#################################################################################
Name: ceph
Version: 14.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
%endif
@@ -431,6 +431,8 @@ Requires: python%{_python_buildid}-six
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy
Requires: python%{_python_buildid}-werkzeug
+Requires: python%{_python_buildid}-gprcio
+Requires: python%{_python_buildid}-protobuf
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy
@@ -2207,6 +2209,9 @@ exit 0
%endif
%changelog
+* Tue Nov 5 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.4-2
+- ceph 14.2.4, partial fix for bz#1768017
+
* Tue Sep 17 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.4-1
- ceph 14.2.4 GA