diff --git a/6000-CVE-2018-16889.patch b/6000-CVE-2018-16889.patch
deleted file mode 100644
index bf3f117e233b7ef391773e0790af5841de8aca06..0000000000000000000000000000000000000000
--- a/6000-CVE-2018-16889.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/rgw/rgw_rest_s3.cc	2018-08-31 01:24:39.000000000 +0800
-+++ b/src/rgw/rgw_rest_s3.cc	2019-04-04 17:22:37.615000000 +0800
-@@ -3751,8 +3751,9 @@ AWSGeneralAbstractor::get_auth_data_v4(c
-   boost::optional<std::string> canonical_headers = \
-     get_v4_canonical_headers(s->info, signed_hdrs, using_qs);
-   if (canonical_headers) {
--    ldout(s->cct, 10) << "canonical headers format = " << *canonical_headers
--                      << dendl;
-+  using sanitize = rgw::crypt_sanitize::log_content;
-+  ldout(s->cct, 10) << "canonical headers format = "
-+                    << sanitize{*canonical_headers} << dendl;
-   } else {
-     throw -EPERM;
-   }
---- a/src/rgw/rgw_auth_s3.cc	2018-08-31 01:24:39.000000000 +0800
-+++ b/src/rgw/rgw_auth_s3.cc	2019-04-04 17:25:27.208000000 +0800
-@@ -659,7 +659,8 @@ get_v4_canon_req_hash(CephContext* cct,
- 
-   const auto canonical_req_hash = calc_hash_sha256(canonical_req);
- 
--  ldout(cct, 10) << "canonical request = " << canonical_req << dendl;
-+  using sanitize = rgw::crypt_sanitize::log_content;
-+  ldout(cct, 10) << "canonical request = " << sanitize{canonical_req} << dendl;
-   ldout(cct, 10) << "canonical request hash = "
-                  << buf_to_hex(canonical_req_hash).data() << dendl;
- 
diff --git a/6001-CVE-2018-16846-1.patch b/6001-CVE-2018-16846-1.patch
deleted file mode 100644
index 5f5887c3be685b11b43751a87c61056e1da6a5d5..0000000000000000000000000000000000000000
--- a/6001-CVE-2018-16846-1.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 4337e6a7d9f92c8549ebee20d0dd67a01e49857f Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <rjohnson@digitalocean.com>
-Date: Fri, 21 Sep 2018 14:49:34 -0700
-Subject: [PATCH] rgw: enforce bounds on max-keys/max-uploads/max-parts
-
-RGW S3 listing operations provided a way for authenticated users to
-cause a denial of service against OMAPs holding bucket indices.
-
-Bound the min & max values that a user could pass into the max-X
-parameters, to keep the system safe. The default of 1000 is chosen to
-match AWS S3 behavior.
-
-Affected operations:
-- ListBucket, via max-keys
-- ListBucketVersions, via max-keys
-- ListBucketMultiPartUploads, via max-uploads
-- ListMultipartUploadParts, via max-parts
-
-The Swift bucket listing codepath already enforced a limit, so is
-unaffected by this issue.
-
-Prior to this commit, the effective limit is the lower of
-osd_max_omap_entries_per_request or osd_max_omap_bytes_per_request.
-
-Backport: luminous, mimic
-Fixes: http://tracker.ceph.com/issues/35994
-Signed-off-by: Robin H. Johnson <rjohnson@digitalocean.com>
-(cherry picked from commit d79f68a1e31f4bc917eec1b6bbc8e8446377dc6b)
-
- Conflicts:
-	src/common/options.cc:
-  Conflicts due to options from master
----
- src/common/options.cc     | 11 +++++++++++
- src/rgw/rgw_op.cc         | 21 +++++----------------
- src/rgw/rgw_op.h          | 25 +++++++++++++++++++++++++
- src/rgw/rgw_rest.cc       | 11 +++++------
- src/rgw/rgw_rest_swift.cc |  2 ++
- 5 files changed, 48 insertions(+), 22 deletions(-)
-
-diff --git a/src/common/options.cc b/src/common/options.cc
-index c1a0e7b05ea0..5b62a3f7c3d6 100644
---- a/src/common/options.cc
-+++ b/src/common/options.cc
-@@ -5705,6 +5705,17 @@ std::vector<Option> get_rgw_options() {
- 			  "of RGW instances under heavy use. If you would like "
- 			  "to turn off cache expiry, set this value to zero."),
- 
-+    Option("rgw_max_listing_results", Option::TYPE_UINT,
-+	   Option::LEVEL_ADVANCED)
-+    .set_default(1000)
-+    .set_min_max(1, 100000)
-+    .add_service("rgw")
-+    .set_description("Upper bound on results in listing operations, ListBucket max-keys"),
-+    .set_long_description("This caps the maximum permitted value for listing-like operations in RGW S3. "
-+			  "Affects ListBucket(max-keys), "
-+			  "ListBucketVersions(max-keys), "
-+			  "ListBucketMultiPartUploads(max-uploads), "
-+			  "ListMultipartUploadParts(max-parts)"),
-   });
- }
- 
-diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
-index 6e7daadcd228..c17d04988169 100644
---- a/src/rgw/rgw_op.cc
-+++ b/src/rgw/rgw_op.cc
-@@ -2279,22 +2279,11 @@ int RGWListBucket::verify_permission()
- 
- int RGWListBucket::parse_max_keys()
- {
--  if (!max_keys.empty()) {
--    char *endptr;
--    max = strtol(max_keys.c_str(), &endptr, 10);
--    if (endptr) {
--      if (endptr == max_keys.c_str()) return -EINVAL;
--      while (*endptr && isspace(*endptr)) // ignore white space
--        endptr++;
--      if (*endptr) {
--        return -EINVAL;
--      }
--    }
--  } else {
--    max = default_max;
--  }
--
--  return 0;
-+  // Bound max value of max-keys to configured value for security
-+  // Bound min value of max-keys to '0'
-+  // Some S3 clients explicitly send max-keys=0 to detect if the bucket is
-+  // empty without listing any items.
-+  op_ret = parse_value_and_bound(max_keys, &max, 0, g_conf()->rgw_max_listing_results, default_max);
- }
- 
- void RGWListBucket::pre_exec()
-diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
-index e4d8cd4a980b..521a3d179d76 100644
---- a/src/rgw/rgw_op.h
-+++ b/src/rgw/rgw_op.h
-@@ -2214,6 +2214,31 @@ class RGWGetClusterStat : public RGWOp {
-   virtual const string name() { return "get_cluster_stat"; }
- };
- 
-+static inline int parse_value_and_bound(const string &input, long *output, const long lower_bound, const long upper_bound, const long default_val)
-+{
-+  if (!input.empty()) {
-+    char *endptr;
-+    *output = strtol(input.c_str(), &endptr, 10);
-+    if (endptr) {
-+      if (endptr == input.c_str()) return -EINVAL;
-+      while (*endptr && isspace(*endptr)) // ignore white space
-+        endptr++;
-+      if (*endptr) {
-+        return -EINVAL;
-+      }
-+    }
-+    if(*output > upper_bound) {
-+      *output = upper_bound;
-+    }
-+    if(*output < lower_bound) {
-+      *output = lower_bound;
-+    }
-+  } else {
-+    *output = default_val;
-+  }
-+
-+  return 0;
-+}
- 
- 
- #endif /* CEPH_RGW_OP_H */
-diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
-index 80a886ec5d11..539cebeb6981 100644
---- a/src/rgw/rgw_rest.cc
-+++ b/src/rgw/rgw_rest.cc
-@@ -1659,8 +1659,7 @@ int RGWListMultipart_ObjStore::get_params()
-   }
-   
-   string str = s->info.args.get("max-parts");
--  if (!str.empty())
--    max_parts = atoi(str.c_str());
-+  op_ret = parse_value_and_bound(str, &max_parts, 0, g_conf()->rgw_max_listing_results, max_parts);
- 
-   return op_ret;
- }
-@@ -1670,10 +1669,10 @@ int RGWListBucketMultiparts_ObjStore::get_params()
-   delimiter = s->info.args.get("delimiter");
-   prefix = s->info.args.get("prefix");
-   string str = s->info.args.get("max-uploads");
--  if (!str.empty())
--    max_uploads = atoi(str.c_str());
--  else
--    max_uploads = default_max;
-+  op_ret = parse_value_and_bound(str, &max_uploads, 0, g_conf()->rgw_max_listing_results, default_max);
-+  if (op_ret < 0) {
-+    return op_ret;
-+  }
- 
-   string key_marker = s->info.args.get("key-marker");
-   string upload_id_marker = s->info.args.get("upload-id-marker");
-diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
-index c9d96d9631bf..35e192c150ed 100644
---- a/src/rgw/rgw_rest_swift.cc
-+++ b/src/rgw/rgw_rest_swift.cc
-@@ -303,6 +303,8 @@ int RGWListBucket_ObjStore_SWIFT::get_params()
-   if (op_ret < 0) {
-     return op_ret;
-   }
-+  // S3 behavior is to silently cap the max-keys.
-+  // Swift behavior is to abort.
-   if (max > default_max)
-     return -ERR_PRECONDITION_FAILED;
- 
diff --git a/6002-CVE-2018-16846-2.patch b/6002-CVE-2018-16846-2.patch
deleted file mode 100644
index aec46dd7e2829c0fefc58e1a270e5e94e1db5b19..0000000000000000000000000000000000000000
--- a/6002-CVE-2018-16846-2.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From ab29bed2fc9f961fe895de1086a8208e21ddaddc Mon Sep 17 00:00:00 2001
-From: Joao Eduardo Luis <joao@suse.de>
-Date: Thu, 29 Nov 2018 01:05:31 +0000
-Subject: [PATCH] rgw: fix issues with 'enforce bounds' patch
-
-The patch to enforce bounds on max-keys/max-uploads/max-parts had a few
-issues that would prevent us from compiling it. Instead of changing the
-code provided by the submitter, we're addressing them in a separate
-commit to maintain the DCO.
-
-Signed-off-by: Joao Eduardo Luis <joao@suse.de>
-Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
-(cherry picked from commit 29bc434a6a81a2e5c5b8cfc4c8d5c82ca5bf538a)
-mimic specific fixes:
-As the largeish change from master g_conf() isn't in mimic yet, use the g_conf
-global structure, also make rgw_op use the value from req_info ceph context as
-we do for all the requests
----
- src/common/options.cc |  2 +-
- src/rgw/rgw_op.cc     |  4 +++-
- src/rgw/rgw_op.h      | 19 ++++++++++++-------
- src/rgw/rgw_rest.cc   |  8 ++++++--
- 4 files changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/src/common/options.cc b/src/common/options.cc
-index a543256d8ad3..d906d1d04e10 100644
---- a/src/common/options.cc
-+++ b/src/common/options.cc
-@@ -6238,7 +6238,7 @@ std::vector<Option> get_rgw_options() {
-     .set_default(1000)
-     .set_min_max(1, 100000)
-     .add_service("rgw")
--    .set_description("Upper bound on results in listing operations, ListBucket max-keys"),
-+    .set_description("Upper bound on results in listing operations, ListBucket max-keys")
-     .set_long_description("This caps the maximum permitted value for listing-like operations in RGW S3. "
- 			  "Affects ListBucket(max-keys), "
- 			  "ListBucketVersions(max-keys), "
-diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
-index 509592943c67..1863d7933375 100644
---- a/src/rgw/rgw_op.cc
-+++ b/src/rgw/rgw_op.cc
-@@ -2383,7 +2383,9 @@ int RGWListBucket::parse_max_keys()
-   // Bound min value of max-keys to '0'
-   // Some S3 clients explicitly send max-keys=0 to detect if the bucket is
-   // empty without listing any items.
--  op_ret = parse_value_and_bound(max_keys, &max, 0, g_conf()->rgw_max_listing_results, default_max);
-+  return parse_value_and_bound(max_keys, max, 0,
-+			s->cct->_conf->get_val<uint64_t>("rgw_max_listing_results"),
-+			default_max);
- }
- 
- void RGWListBucket::pre_exec()
-diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
-index 57352ae8c142..21bc8c7a6fb9 100644
---- a/src/rgw/rgw_op.h
-+++ b/src/rgw/rgw_op.h
-@@ -2235,11 +2235,16 @@ class RGWGetClusterStat : public RGWOp {
-   virtual const string name() { return "get_cluster_stat"; }
- };
- 
--static inline int parse_value_and_bound(const string &input, long *output, const long lower_bound, const long upper_bound, const long default_val)
-+static inline int parse_value_and_bound(
-+    const string &input,
-+    int &output,
-+    const long lower_bound,
-+    const long upper_bound,
-+    const long default_val)
- {
-   if (!input.empty()) {
-     char *endptr;
--    *output = strtol(input.c_str(), &endptr, 10);
-+    output = strtol(input.c_str(), &endptr, 10);
-     if (endptr) {
-       if (endptr == input.c_str()) return -EINVAL;
-       while (*endptr && isspace(*endptr)) // ignore white space
-@@ -2248,14 +2253,14 @@ static inline int parse_value_and_bound(const string &input, long *output, const
-         return -EINVAL;
-       }
-     }
--    if(*output > upper_bound) {
--      *output = upper_bound;
-+    if(output > upper_bound) {
-+      output = upper_bound;
-     }
--    if(*output < lower_bound) {
--      *output = lower_bound;
-+    if(output < lower_bound) {
-+      output = lower_bound;
-     }
-   } else {
--    *output = default_val;
-+    output = default_val;
-   }
- 
-   return 0;
-diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
-index c87192d5674b..fdb1a713efe0 100644
---- a/src/rgw/rgw_rest.cc
-+++ b/src/rgw/rgw_rest.cc
-@@ -1588,7 +1588,9 @@ int RGWListMultipart_ObjStore::get_params()
-   }
-   
-   string str = s->info.args.get("max-parts");
--  op_ret = parse_value_and_bound(str, &max_parts, 0, g_conf()->rgw_max_listing_results, max_parts);
-+  op_ret = parse_value_and_bound(str, max_parts, 0,
-+                                 g_conf->get_val<uint64_t>("rgw_max_listing_results"),
-+                                 max_parts);
- 
-   return op_ret;
- }
-@@ -1598,7 +1600,9 @@ int RGWListBucketMultiparts_ObjStore::get_params()
-   delimiter = s->info.args.get("delimiter");
-   prefix = s->info.args.get("prefix");
-   string str = s->info.args.get("max-uploads");
--  op_ret = parse_value_and_bound(str, &max_uploads, 0, g_conf()->rgw_max_listing_results, default_max);
-+  op_ret = parse_value_and_bound(str, max_uploads, 0,
-+			g_conf->get_val<uint64_t>("rgw_max_listing_results"),
-+			default_max);
-   if (op_ret < 0) {
-     return op_ret;
-   }
diff --git a/6003-CVE-2018-14662.patch b/6003-CVE-2018-14662.patch
deleted file mode 100644
index 465f12ffdc14596a88696d784e711405d3e51280..0000000000000000000000000000000000000000
--- a/6003-CVE-2018-14662.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-From a2acedd2a7e12d58af6db35edbd8a9d29c557578 Mon Sep 17 00:00:00 2001
-From: Joao Eduardo Luis <joao@suse.de>
-Date: Wed, 17 Oct 2018 14:42:15 +0100
-Subject: [PATCH] mon/config-key: limit caps allowed to access the store
-
-Henceforth, we'll require explicit `allow` caps for commands, or for the
-config-key service. Blanket caps are no longer allowed for the
-config-key service, except for 'allow *'.
-
-(for luminous and mimic, we're also ensuring MonCap's parser is able to
-understand forward slashes '/' when parsing prefixes)
-
-Signed-off-by: Joao Eduardo Luis <joao@suse.de>
-(cherry picked from commit 5fff611041c5afeaf3c8eb09e4de0cc919d69237)
----
- .../singleton/all/mon-config-key-caps.yaml    |  17 ++
- qa/workunits/mon/test_config_key_caps.sh      | 201 ++++++++++++++++++
- src/mon/MonCap.cc                             |   8 +-
- 3 files changed, 225 insertions(+), 1 deletion(-)
- create mode 100644 qa/suites/rados/singleton/all/mon-config-key-caps.yaml
- create mode 100755 qa/workunits/mon/test_config_key_caps.sh
-
-diff --git a/qa/suites/rados/singleton/all/mon-config-key-caps.yaml b/qa/suites/rados/singleton/all/mon-config-key-caps.yaml
-new file mode 100644
-index 0000000000..0b0b95c52e
---- /dev/null
-+++ b/qa/suites/rados/singleton/all/mon-config-key-caps.yaml
-@@ -0,0 +1,17 @@
-+roles:
-+- - mon.a
-+  - mgr.x
-+  - osd.0
-+  - osd.1
-+  - osd.2
-+  - client.0
-+tasks:
-+- install:
-+- ceph:
-+    log-whitelist:
-+    - overall HEALTH_
-+    - \(AUTH_BAD_CAPS\)
-+- workunit:
-+    clients:
-+      all:
-+        - mon/test_config_key_caps.sh
-diff --git a/qa/workunits/mon/test_config_key_caps.sh b/qa/workunits/mon/test_config_key_caps.sh
-new file mode 100755
-index 0000000000..77b4b53b70
---- /dev/null
-+++ b/qa/workunits/mon/test_config_key_caps.sh
-@@ -0,0 +1,201 @@
-+#!/usr/bin/env bash
-+
-+set -x
-+set -e
-+
-+tmp=$(mktemp -d -p /tmp test_mon_config_key_caps.XXXXX)
-+entities=()
-+
-+function cleanup()
-+{
-+	set +e
-+	set +x
-+	if [[ -e $tmp/keyring ]] && [[ -e $tmp/keyring.orig ]]; then
-+		grep '\[.*\..*\]' $tmp/keyring.orig > $tmp/entities.orig
-+		for e in $(grep '\[.*\..*\]' $tmp/keyring | \
-+			diff $tmp/entities.orig - | \
-+			sed -n 's/^.*\[\(.*\..*\)\]/\1/p');
-+		do
-+			ceph auth rm $e 2>&1 >& /dev/null
-+		done
-+	fi
-+	#rm -fr $tmp
-+}
-+
-+trap cleanup 0 # cleanup on exit
-+
-+function expect_false()
-+{
-+	set -x
-+	if "$@"; then return 1; else return 0; fi
-+}
-+
-+# for cleanup purposes
-+ceph auth export -o $tmp/keyring.orig
-+
-+k=$tmp/keyring
-+
-+# setup a few keys
-+ceph config-key ls
-+ceph config-key set daemon-private/osd.123/test-foo
-+ceph config-key set mgr/test-foo
-+ceph config-key set device/test-foo
-+ceph config-key set test/foo
-+
-+allow_aa=client.allow_aa
-+allow_bb=client.allow_bb
-+allow_cc=client.allow_cc
-+
-+mgr_a=mgr.a
-+mgr_b=mgr.b
-+osd_a=osd.100
-+osd_b=osd.200
-+
-+prefix_aa=client.prefix_aa
-+prefix_bb=client.prefix_bb
-+prefix_cc=client.prefix_cc
-+match_aa=client.match_aa
-+match_bb=client.match_bb
-+
-+fail_aa=client.fail_aa
-+fail_bb=client.fail_bb
-+fail_cc=client.fail_cc
-+fail_dd=client.fail_dd
-+fail_ee=client.fail_ee
-+fail_ff=client.fail_ff
-+fail_gg=client.fail_gg
-+fail_writes=client.fail_writes
-+
-+ceph auth get-or-create $allow_aa mon 'allow *'
-+ceph auth get-or-create $allow_bb mon 'allow service config-key rwx'
-+ceph auth get-or-create $allow_cc mon 'allow command "config-key get"'
-+
-+ceph auth get-or-create $mgr_a mon 'allow profile mgr'
-+ceph auth get-or-create $mgr_b mon 'allow profile mgr'
-+ceph auth get-or-create $osd_a mon 'allow profile osd'
-+ceph auth get-or-create $osd_b mon 'allow profile osd'
-+
-+ceph auth get-or-create $prefix_aa mon \
-+	"allow command \"config-key get\" with key prefix client/$prefix_aa"
-+
-+cap="allow command \"config-key set\" with key prefix client/"
-+cap="$cap,allow command \"config-key get\" with key prefix client/$prefix_bb"
-+ceph auth get-or-create $prefix_bb mon "$cap"
-+
-+cap="allow command \"config-key get\" with key prefix client/"
-+cap="$cap, allow command \"config-key set\" with key prefix client/"
-+cap="$cap, allow command \"config-key ls\""
-+ceph auth get-or-create $prefix_cc mon "$cap"
-+
-+cap="allow command \"config-key get\" with key=client/$match_aa/foo"
-+ceph auth get-or-create $match_aa mon "$cap"
-+cap="allow command \"config-key get\" with key=client/$match_bb/foo"
-+cap="$cap,allow command \"config-key set\" with key=client/$match_bb/foo"
-+ceph auth get-or-create $match_bb mon "$cap"
-+
-+ceph auth get-or-create $fail_aa mon 'allow rx'
-+ceph auth get-or-create $fail_bb mon 'allow r,allow w'
-+ceph auth get-or-create $fail_cc mon 'allow rw'
-+ceph auth get-or-create $fail_dd mon 'allow rwx'
-+ceph auth get-or-create $fail_ee mon 'allow profile bootstrap-rgw'
-+ceph auth get-or-create $fail_ff mon 'allow profile bootstrap-rbd'
-+# write commands will require rw; wx is not enough
-+ceph auth get-or-create $fail_gg mon 'allow service config-key wx'
-+# read commands will only require 'r'; 'rx' should be enough.
-+ceph auth get-or-create $fail_writes mon 'allow service config-key rx'
-+
-+# grab keyring
-+ceph auth export -o $k
-+
-+# keys will all the caps can do whatever
-+for c in $allow_aa $allow_bb $allow_cc $mgr_a $mgr_b; do
-+	ceph -k $k --name $c config-key get daemon-private/osd.123/test-foo
-+	ceph -k $k --name $c config-key get mgr/test-foo
-+	ceph -k $k --name $c config-key get device/test-foo
-+	ceph -k $k --name $c config-key get test/foo
-+done
-+
-+for c in $osd_a $osd_b; do
-+	ceph -k $k --name $c config-key put daemon-private/$c/test-foo
-+	ceph -k $k --name $c config-key get daemon-private/$c/test-foo
-+	expect_false ceph -k $k --name $c config-key ls
-+	expect_false ceph -k $k --name $c config-key get mgr/test-foo
-+	expect_false ceph -k $k --name $c config-key get device/test-foo
-+	expect_false ceph -k $k --name $c config-key get test/foo
-+done
-+
-+expect_false ceph -k $k --name $osd_a get daemon-private/$osd_b/test-foo
-+expect_false ceph -k $k --name $osd_b get daemon-private/$osd_a/test-foo
-+
-+expect_false ceph -k $k --name $prefix_aa \
-+	config-key ls
-+expect_false ceph -k $k --name $prefix_aa \
-+	config-key get daemon-private/osd.123/test-foo
-+expect_false ceph -k $k --name $prefix_aa \
-+	config-key set test/bar
-+expect_false ceph -k $k --name $prefix_aa \
-+	config-key set client/$prefix_aa/foo
-+
-+# write something so we can read, use a custom entity
-+ceph -k $k --name $allow_bb config-key set client/$prefix_aa/foo
-+ceph -k $k --name $prefix_aa config-key get client/$prefix_aa/foo
-+# check one writes to the other's prefix, the other is able to read
-+ceph -k $k --name $prefix_bb config-key set client/$prefix_aa/bar
-+ceph -k $k --name $prefix_aa config-key get client/$prefix_aa/bar
-+
-+ceph -k $k --name $prefix_bb config-key set client/$prefix_bb/foo
-+ceph -k $k --name $prefix_bb config-key get client/$prefix_bb/foo
-+
-+expect_false ceph -k $k --name $prefix_bb config-key get client/$prefix_aa/bar
-+expect_false ceph -k $k --name $prefix_bb config-key ls
-+expect_false ceph -k $k --name $prefix_bb \
-+	config-key get daemon-private/osd.123/test-foo
-+expect_false ceph -k $k --name $prefix_bb config-key get mgr/test-foo
-+expect_false ceph -k $k --name $prefix_bb config-key get device/test-foo
-+expect_false ceph -k $k --name $prefix_bb config-key get test/bar
-+expect_false ceph -k $k --name $prefix_bb config-key set test/bar
-+
-+ceph -k $k --name $prefix_cc config-key set client/$match_aa/foo
-+ceph -k $k --name $prefix_cc config-key set client/$match_bb/foo
-+ceph -k $k --name $prefix_cc config-key get client/$match_aa/foo
-+ceph -k $k --name $prefix_cc config-key get client/$match_bb/foo
-+expect_false ceph -k $k --name $prefix_cc config-key set other/prefix
-+expect_false ceph -k $k --name $prefix_cc config-key get mgr/test-foo
-+ceph -k $k --name $prefix_cc config-key ls >& /dev/null
-+
-+ceph -k $k --name $match_aa config-key get client/$match_aa/foo
-+expect_false ceph -k $k --name $match_aa config-key get client/$match_bb/foo
-+expect_false ceph -k $k --name $match_aa config-key set client/$match_aa/foo
-+ceph -k $k --name $match_bb config-key get client/$match_bb/foo
-+ceph -k $k --name $match_bb config-key set client/$match_bb/foo
-+expect_false ceph -k $k --name $match_bb config-key get client/$match_aa/foo
-+expect_false ceph -k $k --name $match_bb config-key set client/$match_aa/foo
-+
-+keys=(daemon-private/osd.123/test-foo
-+	  mgr/test-foo
-+	  device/test-foo
-+	  test/foo
-+	  client/$prefix_aa/foo
-+	  client/$prefix_bb/foo
-+	  client/$match_aa/foo
-+	  client/$match_bb/foo
-+)
-+# expect these all to fail accessing config-key
-+for c in $fail_aa $fail_bb $fail_cc \
-+		 $fail_dd $fail_ee $fail_ff \
-+		 $fail_gg; do
-+	for m in get set; do
-+		for key in ${keys[*]} client/$prefix_aa/foo client/$prefix_bb/foo; do
-+			expect_false ceph -k $k --name $c config-key $m $key
-+		done
-+	done
-+done
-+
-+# fail writes but succeed on reads
-+expect_false ceph -k $k --name $fail_writes config-key set client/$match_aa/foo
-+expect_false ceph -k $k --name $fail_writes config-key set test/foo
-+ceph -k $k --name $fail_writes config-key ls
-+ceph -k $k --name $fail_writes config-key get client/$match_aa/foo 
-+ceph -k $k --name $fail_writes config-key get daemon-private/osd.123/test-foo
-+
-+echo "OK"
-diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
-index 6340ad7b14..c64f7e1081 100644
---- a/src/mon/MonCap.cc
-+++ b/src/mon/MonCap.cc
-@@ -350,6 +350,12 @@ mon_rwxa_t MonCapGrant::get_allowed(CephContext *cct,
-     }
-     return MON_CAP_ALL;
-   }
-+  // we don't allow config-key service to be accessed with blanket caps other
-+  // than '*' (i.e., 'any'), and that should have been checked by the caller
-+  // via 'is_allow_all()'.
-+  if (s == "config-key") {
-+    return 0;
-+  }
-   return allow;
- }
- 
-@@ -484,7 +490,7 @@ struct MonCapParser : qi::grammar<Iterator, MonCap()>
-     quoted_string %=
-       lexeme['"' >> +(char_ - '"') >> '"'] | 
-       lexeme['\'' >> +(char_ - '\'') >> '\''];
--    unquoted_word %= +char_("a-zA-Z0-9_.-");
-+    unquoted_word %= +char_("a-zA-Z0-9_/.-");
-     str %= quoted_string | unquoted_word;
- 
-     spaces = +(lit(' ') | lit('\n') | lit('\t'));
-
diff --git a/6004-py3.patch b/6004-py3.patch
deleted file mode 100644
index f7bfd2019d0364c3d305a07d2949d2659ecb4a69..0000000000000000000000000000000000000000
--- a/6004-py3.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 96e17e73608333c1d23e8950f7daf59d6e290248 Mon Sep 17 00:00:00 2001
-From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
-Date: Thu, 29 Oct 2020 14:37:47 +0800
-Subject: [PATCH] cpeh-remove-python3
-
-https://src.fedoraproject.org/rpms/ceph/c/96e17e73608333c1d23e8950f7daf59d6e290248
-Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
----
- src/CMakeLists.txt                            | 3 ---
- src/brag/client/ceph-brag                     | 2 +-
- src/ceph-create-keys                          | 2 +-
- src/ceph-detect-init/ceph_detect_init/main.py | 2 +-
- src/ceph-disk/ceph_disk/main.py               | 2 +-
- src/ceph-rest-api                             | 2 +-
- src/ceph-volume/bin/ceph-volume               | 2 +-
- src/ceph-volume/bin/ceph-volume-systemd       | 2 +-
- src/ceph.in                                   | 2 +-
- src/mount.fuse.ceph                           | 2 +-
- src/pybind/CMakeLists.txt                     | 3 +--
- src/tools/setup-virtualenv.sh                 | 4 +++-
- 12 files changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 80d4b351..7ca500b1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -244,9 +244,6 @@ if(WITH_CEPHFS_JAVA)
- 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)
-diff --git a/src/brag/client/ceph-brag b/src/brag/client/ceph-brag
-index 7df51674..69bbba20 100755
---- a/src/brag/client/ceph-brag
-+++ b/src/brag/client/ceph-brag
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- 
-diff --git a/src/ceph-create-keys b/src/ceph-create-keys
-index c14c02f2..7e80aab6 100755
---- a/src/ceph-create-keys
-+++ b/src/ceph-create-keys
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- import argparse
- import errno
- import json
-diff --git a/src/ceph-detect-init/ceph_detect_init/main.py b/src/ceph-detect-init/ceph_detect_init/main.py
-index 320ae170..c18ce74c 100644
---- a/src/ceph-detect-init/ceph_detect_init/main.py
-+++ b/src/ceph-detect-init/ceph_detect_init/main.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- #
- # Copyright (C) 2015 <contact@redhat.com>
- # Copyright (C) 2015 SUSE LINUX GmbH
-diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
-index 0058f1ac..0bdbcba3 100644
---- a/src/ceph-disk/ceph_disk/main.py
-+++ b/src/ceph-disk/ceph_disk/main.py
-@@ -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 --git a/src/ceph-rest-api b/src/ceph-rest-api
-index d185a804..2761dcc7 100755
---- a/src/ceph-rest-api
-+++ b/src/ceph-rest-api
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # vim: ts=4 sw=4 smarttab expandtab
- 
- import argparse
-diff --git a/src/ceph-volume/bin/ceph-volume b/src/ceph-volume/bin/ceph-volume
-index 5905cfcc..a4f62b4a 100755
---- a/src/ceph-volume/bin/ceph-volume
-+++ b/src/ceph-volume/bin/ceph-volume
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume import main
- 
-diff --git a/src/ceph-volume/bin/ceph-volume-systemd b/src/ceph-volume/bin/ceph-volume-systemd
-index 7da8ec6b..f6c751cf 100755
---- a/src/ceph-volume/bin/ceph-volume-systemd
-+++ b/src/ceph-volume/bin/ceph-volume-systemd
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from ceph_volume.systemd import main
- 
-diff --git a/src/ceph.in b/src/ceph.in
-index 7c1eda2c..5e0471cb 100755
---- a/src/ceph.in
-+++ b/src/ceph.in
-@@ -1,4 +1,4 @@
--#!@PYTHON_EXECUTABLE@
-+#!@PYTHON3_EXECUTABLE@
- # -*- mode:python -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
-diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
-index 5c65ddca..4c0addf5 100755
---- a/src/mount.fuse.ceph
-+++ b/src/mount.fuse.ceph
-@@ -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:
-diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
-index dbdb23f1..1a14df97 100644
---- a/src/pybind/CMakeLists.txt
-+++ b/src/pybind/CMakeLists.txt
-@@ -6,7 +6,6 @@ set(CYTHON_MODULE_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules)
- 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 @@ endforeach()
- 
- 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:
-diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
-index d249d49f..51763ac6 100755
---- a/src/tools/setup-virtualenv.sh
-+++ b/src/tools/setup-virtualenv.sh
-@@ -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
--- 
-2.27.0
-
diff --git a/ceph-12.2.8.tar.gz b/ceph-14.2.15.tar.gz
similarity index 58%
rename from ceph-12.2.8.tar.gz
rename to ceph-14.2.15.tar.gz
index d06b59ae90b4e0030571810edede16187c0efc23..67b858f07bd7e4ddaa94f95c282f020b67bf256a 100644
Binary files a/ceph-12.2.8.tar.gz and b/ceph-14.2.15.tar.gz differ
diff --git a/ceph.spec b/ceph.spec
index c1921ed37105fdbcb369d196770cbd184e1829a0..c2ce8376b2a74004f86ade1fa0626e6bc07d41a6 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -2,7 +2,7 @@
 #
 # spec file for package ceph
 #
-# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
+# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
 # at the top-level directory of this distribution and at
 # https://github.com/ceph/ceph/blob/master/COPYING
 #
@@ -15,49 +15,89 @@
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
 
+#################################################################################
+# conditional build section
 #
-# openEuler got this spec file from ceph community, and it was packed in ceph-12.2.8.tar.gz release package.
-# openEuler added some patches and rewrote several sentences.
-#
-
-%global fixme 0
-
-%bcond_without ocf
-%bcond_with cephfs_java
-%if 0%{?suse_version}
-%bcond_with ceph_test_package
-%else
-%bcond_without ceph_test_package
-%endif
+# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
+# bcond syntax!
+#################################################################################
 %bcond_with make_check
+%bcond_without ceph_test_package
 %ifarch s390 s390x
 %bcond_with tcmalloc
 %else
 %bcond_without tcmalloc
 %endif
-%bcond_with lowmem_builder
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %bcond_without selinux
+%if 0%{?rhel} >= 8 || 0%{?openEuler}
+%bcond_with cephfs_java
+%else
+%bcond_without cephfs_java
+%endif
+%bcond_without amqp_endpoint
+%bcond_without lttng
+%bcond_without libradosstriper
+%bcond_without ocf
+%bcond_without kafka_endpoint
+%global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
 %if 0%{?suse_version}
 %bcond_with selinux
+%bcond_with cephfs_java
+%bcond_with amqp_endpoint
+%bcond_with kafka_endpoint
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+%global _fillupdir /var/adm/fillup-templates
 %endif
-
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?openEuler}
-%if ! 0%{?is_opensuse}
+%if 0%{?is_opensuse}
+%bcond_without libradosstriper
+%bcond_without ocf
+%else
+%bcond_with libradosstriper
+%bcond_with ocf
+%endif
+%ifarch x86_64 aarch64 ppc64le
 %bcond_without lttng
+%else
+%bcond_with lttng
 %endif
 %endif
-
+%bcond_with seastar
+%if 0%{?fedora} >= 29 || 0%{?suse_version} >= 1500 || 0%{?rhel} >= 8 || 0%{?openEuler}
+# distros that need a py3 Ceph build
+%bcond_with python3
+%else
+# distros that need a py2 Ceph build
+%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
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 8 || 0%{?openEuler}
+%global weak_deps 1
+%endif
 %if %{with selinux}
 # get selinux policy version
-%{!?_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)}
+%{!?_selinux_policy_version: %global _selinux_policy_version 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}
+%{!?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
+%global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}
 
 # unify libexec for all targets
 %global _libexecdir %{_exec_prefix}/lib
@@ -69,9 +109,11 @@
 # main package definition
 #################################################################################
 Name:		ceph
-Version:	12.2.8
-Release:	9
+Version:	14.2.15
+Release:	1%{?dist}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 Epoch:		2
+%endif
 
 # define _epoch_prefix macro which will expand to the empty string if epoch is
 # undefined
@@ -83,30 +125,18 @@ 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:	http://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
-
-# backport for cves
-Patch6000:	6000-CVE-2018-16889.patch
-Patch6001:	6001-CVE-2018-16846-1.patch
-Patch6002:	6002-CVE-2018-16846-2.patch
-Patch6003:	6003-CVE-2018-14662.patch
-Patch6004:	6004-py3.patch
+Source0:	%{?_remote_tarball_prefix}ceph-14.2.15.tar.gz
 
 %if 0%{?suse_version}
-%if 0%{?is_opensuse}
-ExclusiveArch:  x86_64 aarch64 ppc64 ppc64le
-%else
+# _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
 %endif
-%endif
 #################################################################################
 # dependencies that apply across all distro families
 #################################################################################
 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}
@@ -116,51 +146,52 @@ BuildRequires:	sharutils
 %if 0%{with selinux}
 BuildRequires:	checkpolicy
 BuildRequires:	selinux-policy-devel
-BuildRequires:	selinux-policy-doc
-%endif
-%if 0%{with make_check}
-%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
-BuildRequires:	python3-cherrypy
-BuildRequires:	python3-werkzeug
-%endif
-%if 0%{?suse_version}
-BuildRequires:	python3-CherryPy
-BuildRequires:	python3-Werkzeug
-BuildRequires:	python-numpy-devel
 %endif
-BuildRequires:  python3-coverage
-BuildRequires:	python3-pecan
-BuildRequires:	socat
-%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-8-gcc-c++ >= 8.2.1
+%else
 BuildRequires:	gcc-c++
+%endif
 BuildRequires:	gdbm
 %if 0%{with tcmalloc}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
+BuildRequires:	gperftools-devel >= 2.6.1
+%endif
+%if 0%{?suse_version}
 BuildRequires:	gperftools-devel >= 2.4
 %endif
-BuildRequires:  jq
+%endif
 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:	make
+BuildRequires:	ncurses-devel
 BuildRequires:	parted
+BuildRequires:	patch
 BuildRequires:	perl
 BuildRequires:	pkgconfig
-BuildRequires:	python3
-BuildRequires:	python3-devel
-BuildRequires:	python3-nose
-BuildRequires:	python3-requests
-BuildRequires:	python3-six
-BuildRequires:	python3-virtualenv
+BuildRequires:  procps
+BuildRequires:	python%{_python_buildid}
+BuildRequires:	python%{_python_buildid}-devel
 BuildRequires:	snappy-devel
+BuildRequires:	sudo
 BuildRequires:	udev
 BuildRequires:	util-linux
 BuildRequires:	valgrind-devel
@@ -168,50 +199,121 @@ BuildRequires:	which
 BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
-BuildRequires:  yasm
-BuildRequires:	chrpath
-
+BuildRequires:	yasm
+%if 0%{with amqp_endpoint}
+BuildRequires:  librabbitmq-devel
+%endif
+%if 0%{with kafka_endpoint}
+BuildRequires:  librdkafka-devel
+%endif
+%if 0%{with make_check}
+BuildRequires:  jq
+BuildRequires:	libuuid-devel
+BuildRequires:	python%{_python_buildid}-bcrypt
+BuildRequires:	python%{_python_buildid}-nose
+BuildRequires:	python%{_python_buildid}-pecan
+BuildRequires:	python%{_python_buildid}-requests
+BuildRequires:	python%{_python_buildid}-six
+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
 #################################################################################
 %if 0%{?suse_version}
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:	systemd-rpm-macros
-BuildRequires:	systemd
 %{?systemd_requires}
 PreReq:		%fillup_prereq
+BuildRequires:	fdupes
 BuildRequires:	net-tools
 BuildRequires:	libbz2-devel
-BuildRequires:  btrfsprogs
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	keyutils-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  lsb-release
 BuildRequires:  openldap2-devel
-BuildRequires:	python-Cython
-BuildRequires:	python-PrettyTable
-BuildRequires:	python-Sphinx
+#BuildRequires:  krb5
+#BuildRequires:  krb5-devel
+BuildRequires:  cunit-devel
+BuildRequires:	python%{_python_buildid}-setuptools
+BuildRequires:	python%{_python_buildid}-Cython
+BuildRequires:	python%{_python_buildid}-PrettyTable
+BuildRequires:	python%{_python_buildid}-Sphinx
 BuildRequires:  rdma-core-devel
+BuildRequires:	liblz4-devel >= 1.7
+# for prometheus-alerts
+BuildRequires:  golang-github-prometheus-prometheus
 %endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 Requires:	systemd
 BuildRequires:  boost-random
-BuildRequires:	boost-devel
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libibverbs-devel
-%ifnarch %{arm}
-BuildRequires:	rdma-core-devel
-%endif
+BuildRequires:  librdmacm-devel
 BuildRequires:  openldap-devel
+#BuildRequires:  krb5-devel
 BuildRequires:  openssl-devel
-BuildRequires:	python3-Cython
-BuildRequires:	python3-prettytable
-BuildRequires:	python3-sphinx
+BuildRequires:  CUnit-devel
+#BuildRequires:  redhat-lsb-core
+%if 0%{with python2}
+BuildRequires:	python2-Cython
+%endif
+BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-setuptools
+%if 0%{?rhel} == 7
+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
+%endif
+# distro-conditional make check dependencies
+%if 0%{with make_check}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
+BuildRequires:	python%{_python_buildid}-coverage
+BuildRequires:	python%{_python_buildid}-pecan
+BuildRequires:	python%{_python_buildid}-tox
+BuildRequires:  xmlsec1
+%if 0%{?rhel} == 7
+BuildRequires:  pyOpenSSL%{_python_buildid}
+%else
+BuildRequires:  python%{_python_buildid}-pyOpenSSL
+%endif
+BuildRequires:	python%{_python_buildid}-cherrypy
+BuildRequires:	python%{_python_buildid}-jwt
+BuildRequires:	python%{_python_buildid}-routes
+BuildRequires:  python%{_python_buildid}-scipy
+BuildRequires:	python%{_python_buildid}-werkzeug
+%endif
+%if 0%{?suse_version}
+BuildRequires:	python%{_python_buildid}-CherryPy
+BuildRequires:	python%{_python_buildid}-PyJWT
+BuildRequires:	python%{_python_buildid}-Routes
+BuildRequires:	python%{_python_buildid}-Werkzeug
+BuildRequires:	python%{_python_buildid}-coverage
+BuildRequires:	python%{_python_buildid}-numpy-devel
+BuildRequires:	python%{_python_buildid}-pecan
+BuildRequires:	python%{_python_buildid}-pyOpenSSL
+BuildRequires:	python%{_python_buildid}-tox
+BuildRequires:	rpm-build
+BuildRequires:  xmlsec1-devel
+%endif
 %endif
-BuildRequires:	python3-devel
-BuildRequires:	python3-setuptools
-BuildRequires:	python3-Cython
 # lttng and babeltrace for rbd-replay-prep
 %if %{with lttng}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
@@ -230,9 +332,26 @@ BuildRequires:	libexpat-devel
 BuildRequires:	expat-devel
 %endif
 #hardened-cc1
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires:  redhat-rpm-config
+%endif
 %if 0%{?openEuler}
 BuildRequires:  openEuler-rpm-config
 %endif
+%if 0%{with seastar}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
+BuildRequires:  cryptopp-devel
+BuildRequires:  numactl-devel
+BuildRequires:  protobuf-compiler
+%endif
+%if 0%{?suse_version}
+BuildRequires:  libcryptopp-devel
+BuildRequires:  libnuma-devel
+%endif
+%endif
+%if 0%{?rhel} >= 8 || 0%{?openEuler}
+BuildRequires:  /usr/bin/pathfix.py
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
@@ -247,6 +366,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}
@@ -255,21 +375,26 @@ Requires:      librgw2 = %{_epoch_prefix}%{version}-%{release}
 %if 0%{with selinux}
 Requires:      ceph-selinux = %{_epoch_prefix}%{version}-%{release}
 %endif
-Requires(post):/sbin/ldconfig
-Requires(postun):/sbin/ldconfig
-Requires:      python3
-Requires:      python3-requests
-Requires:      python3-setuptools
-Requires:      grep
-Requires:      xfsprogs
-Requires:      logrotate
-Requires:      util-linux
 Requires:      cryptsetup
+Requires:      e2fsprogs
 Requires:      findutils
+Requires:      grep
+Requires:      logrotate
+Requires:      parted
 Requires:      psmisc
+Requires:      python%{_python_buildid}-setuptools
+Requires:      util-linux
+Requires:      xfsprogs
 Requires:      which
-%if 0%{?suse_version}
-Recommends:    ntp-daemon
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
+# 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%{?weak_deps}
+Recommends:    chrony
 %endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
@@ -282,17 +407,20 @@ Group:		System/Filesystems
 Requires:	librbd1 = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
 Requires:	libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires:	python3-rados = %{_epoch_prefix}%{version}-%{release}
-Requires:	python3-rbd = %{_epoch_prefix}%{version}-%{release}
-Requires:	python3-cephfs = %{_epoch_prefix}%{version}-%{release}
-Requires:	python3-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires:	python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
-Requires:	python3-prettytable
+Requires:	python%{_python_buildid}-prettytable
 %endif
 %if 0%{?suse_version}
-Requires:	python-PrettyTable
+Requires:	python%{_python_buildid}-PrettyTable
+%endif
+%if 0%{with libradosstriper}
+Requires:	libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
 %endif
-Requires:	python3-requests
 %{?systemd_requires}
 %if 0%{?suse_version}
 Requires(pre):	pwdutils
@@ -317,48 +445,155 @@ 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}
-Requires:	python3-six
-# For ceph-rest-api
-%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
-Requires:      python3-flask
-%endif
-%if 0%{?suse_version}
-Requires:      python-Flask
-%endif
 %description mon
 ceph-mon is the cluster monitor daemon for the Ceph distributed file
 system. One or more instances of ceph-mon form a Paxos part-time
 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}
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
-Requires:       python3-six
+Requires:       python%{_python_buildid}-bcrypt
+Requires:       python%{_python_buildid}-pecan
+Requires:       python%{_python_buildid}-requests
+Requires:       python%{_python_buildid}-six
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
-Requires:       python3-cherrypy
-Requires:       python3-jinja2
-Requires:       python3-werkzeug
-Requires:       python3-pyOpenSSL
+Requires:       python%{_python_buildid}-cherrypy
+Requires:       python%{_python_buildid}-werkzeug
 %endif
 %if 0%{?suse_version}
-Requires: 	python-CherryPy
-Requires:       python-jinja2
-Requires:       python-Werkzeug
-Requires:       python-pyOpenSSL
+Requires:       python%{_python_buildid}-CherryPy
+Requires:       python%{_python_buildid}-Werkzeug
+%endif
+%if 0%{?weak_deps}
+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}
+Recommends:	python%{_python_buildid}-influxdb
+%endif
+%if 0%{?rhel} == 7
+Requires:       pyOpenSSL
+%else
+Requires:       python%{_python_buildid}-pyOpenSSL
 %endif
-Requires:       python3-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.
+
+%package mgr-dashboard
+Summary:        Ceph Dashboard
+BuildArch:      noarch
+%if 0%{?suse_version}
+Group:          System/Filesystems
+%endif
+Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires:       ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
+Requires:       python%{_python_buildid}-cherrypy
+Requires:       python%{_python_buildid}-jwt
+Requires:       python%{_python_buildid}-routes
+Requires:       python%{_python_buildid}-werkzeug
+%if 0%{?weak_deps}
+Recommends:     python%{_python_buildid}-saml
+%endif
+%endif
+%if 0%{?suse_version}
+Requires:       python%{_python_buildid}-CherryPy
+Requires:       python%{_python_buildid}-PyJWT
+Requires:       python%{_python_buildid}-Routes
+Requires:       python%{_python_buildid}-Werkzeug
+%endif
+%if 0%{?rhel} == 7
+Requires:       pyOpenSSL
+%else
+Requires:       python%{_python_buildid}-pyOpenSSL
+%endif
+%description mgr-dashboard
+ceph-mgr-dashboard is a manager plugin, providing a web-based application
+to monitor and manage many aspects of a Ceph cluster and related components.
+See the Dashboard documentation at http://docs.ceph.com/ for details and a
+detailed feature overview.
+
+%package mgr-diskprediction-local
+Summary:        ceph-mgr diskprediction_local plugin
+BuildArch:      noarch
+%if 0%{?suse_version}
+Group:          System/Filesystems
+%endif
+Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?suse_version} || 0%{?openEuler}
+Requires:       python%{_python_buildid}-numpy
+%if 0%{without python2}
+Requires:       python3-scipy
+%else
+Requires:       python2-scipy
+%endif
+%endif
+%if 0%{?rhel} == 7
+Requires:       numpy
+Requires:       scipy
+%endif
+%description mgr-diskprediction-local
+ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict
+disk failures using local algorithms and machine-learning databases.
+
+%package mgr-diskprediction-cloud
+Summary:        ceph-mgr diskprediction_cloud plugin
+BuildArch:      noarch
+%if 0%{?suse_version}
+Group:          System/Filesystems
+%endif
+Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+%description mgr-diskprediction-cloud
+ceph-mgr-diskprediction-cloud is a ceph-mgr plugin that tries to predict
+disk failures using services in the Google cloud.
+
+%package mgr-rook
+BuildArch:      noarch
+Summary:        ceph-mgr rook plugin
+%if 0%{?suse_version}
+Group:          System/Filesystems
 %endif
+Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires:       python%{_python_buildid}-kubernetes
+%description mgr-rook
+ceph-mgr-rook is a ceph-mgr plugin for orchestration functions using
+a Rook backend.
+
+%package mgr-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
+%if 0%{?suse_version}
+Group:          System/Filesystems
+%endif
+Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires:       python%{_python_buildid}-remoto
+%description mgr-ssh
+ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
+direct SSH connections for management operations.
 
 %package fuse
 Summary:	Ceph fuse-based client
@@ -366,6 +601,7 @@ Summary:	Ceph fuse-based client
 Group:		System/Filesystems
 %endif
 Requires:       fuse
+Requires:	python%{python3_pkgversion}
 %description fuse
 FUSE based client for Ceph distributed network file system
 
@@ -384,8 +620,9 @@ 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}
+Requires:	librbd1 = %{_epoch_prefix}%{version}-%{release}
 %description -n rbd-mirror
 Daemon for mirroring RBD images between Ceph clusters, streaming
 changes asynchronously.
@@ -405,7 +642,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
@@ -439,16 +676,11 @@ 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}
-# for sgdisk, used by ceph-disk
-%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
-Requires:	gdisk
-%endif
-%if 0%{?suse_version}
-Requires:	gptfdisk
-%endif
-Requires:	parted
 Requires:	lvm2
+Requires:	sudo
+Requires: libstoragemgmt
 %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
@@ -478,7 +710,18 @@ Obsoletes:	ceph-devel < %{_epoch_prefix}%{version}-%{release}
 Provides:	librados2-devel = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	librados2-devel < %{_epoch_prefix}%{version}-%{release}
 %description -n librados-devel
-This package contains libraries and headers needed to develop programs
+This package contains C libraries and headers needed to develop programs
+that use RADOS object store.
+
+%package -n libradospp-devel
+Summary:	RADOS headers
+%if 0%{?suse_version}
+Group:		Development/Libraries/C and C++
+%endif
+Requires:	librados2 = %{_epoch_prefix}%{version}-%{release}
+Requires:	librados-devel = %{_epoch_prefix}%{version}-%{release}
+%description -n libradospp-devel
+This package contains C++ libraries and headers needed to develop programs
 that use RADOS object store.
 
 %package -n librgw2
@@ -504,28 +747,68 @@ 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%{with python2}
+%package -n python-rgw
+Summary:	Python 2 libraries for the RADOS gateway
+%if 0%{?suse_version}
+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}
+%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
 %if 0%{?suse_version}
-Group:		Development/Languages/Python
+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.
 
+%if 0%{with python2}
+%package -n python-rados
+Summary:	Python 2 libraries for the RADOS object store
+%if 0%{?suse_version}
+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
+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
+Group:		Development/Libraries/Python
 %endif
 Requires:	python%{python3_pkgversion}
 Requires:	librados2 = %{_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}
+%endif
 %description -n python%{python3_pkgversion}-rados
 This package contains Python 3 libraries for interacting with Cephs RADOS
 object store.
 
+%if 0%{with libradosstriper}
 %package -n libradosstriper1
 Summary:	RADOS striping interface
 %if 0%{?suse_version}
@@ -544,12 +827,14 @@ Group:		Development/Libraries/C and C++
 %endif
 Requires:	libradosstriper1 = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados-devel = %{_epoch_prefix}%{version}-%{release}
+Requires:	libradospp-devel = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	ceph-devel < %{_epoch_prefix}%{version}-%{release}
 Provides:	libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release}
 %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
@@ -576,6 +861,7 @@ Group:		Development/Libraries/C and C++
 %endif
 Requires:	librbd1 = %{_epoch_prefix}%{version}-%{release}
 Requires:	librados-devel = %{_epoch_prefix}%{version}-%{release}
+Requires:	libradospp-devel = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	ceph-devel < %{_epoch_prefix}%{version}-%{release}
 Provides:	librbd1-devel = %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	librbd1-devel < %{_epoch_prefix}%{version}-%{release}
@@ -583,13 +869,34 @@ Obsoletes:	librbd1-devel < %{_epoch_prefix}%{version}-%{release}
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
 
+%if 0%{with python2}
+%package -n python-rbd
+Summary:	Python 2 libraries for the RADOS block device
+%if 0%{?suse_version}
+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
+block device.
+%endif
+
 %package -n python%{python3_pkgversion}-rbd
 Summary:	Python 3 libraries for the RADOS block device
 %if 0%{?suse_version}
-Group:		Development/Languages/Python
+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}
+Provides:	python3-rbd = %{_epoch_prefix}%{version}-%{release}
+%if 0%{without python2}
+Provides:	python-rbd = %{_epoch_prefix}%{version}-%{release}
+Obsoletes:	python-rbd < %{_epoch_prefix}%{version}-%{release}
+%endif
 %description -n python%{python3_pkgversion}-rbd
 This package contains Python 3 libraries for interacting with Cephs RADOS
 block device.
@@ -599,7 +906,7 @@ Summary:	Ceph distributed file system client library
 %if 0%{?suse_version}
 Group:		System/Libraries
 %endif
-Obsoletes:	libcephfs1
+Obsoletes:	libcephfs1 < %{_epoch_prefix}%{version}-%{release}
 %if 0%{?rhel} || 0%{?fedora} || 0%{?openEuler}
 Obsoletes:	ceph-libs < %{_epoch_prefix}%{version}-%{release}
 Obsoletes:	ceph-libcephfs
@@ -624,28 +931,76 @@ 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%{with python2}
+%package -n python-cephfs
+Summary:	Python 2 libraries for Ceph distributed file system
+%if 0%{?suse_version}
+Group:		Development/Libraries/Python
+%endif
+Requires:	libcephfs2 = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-rados = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+%{?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
+file system.
+%endif
+
 %package -n python%{python3_pkgversion}-cephfs
 Summary:	Python 3 libraries for Ceph distributed file system
 %if 0%{?suse_version}
-Group:		Development/Languages/Python
+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}
+%{?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}
+%endif
 %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}
-Group:		Development/Languages/Python
+Group:		Development/Libraries/Python
 %endif
+%{?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
 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}
 %package -n ceph-test
 Summary:	Ceph benchmarks and test tools
@@ -696,7 +1051,6 @@ Requires:	java
 Requires:	libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release}
 Requires:       junit
 BuildRequires:  junit
-
 %description -n cephfs-java
 This package contains the Java libraries for the Ceph File System.
 
@@ -704,8 +1058,10 @@ This package contains the Java libraries for the Ceph File System.
 
 %package -n rados-objclass-devel
 Summary:        RADOS object class development kit
-Group:          Development/Libraries
-Requires:       librados2-devel = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?suse_version}
+Group:		Development/Libraries/C and C++
+%endif
+Requires:       libradospp-devel = %{_epoch_prefix}%{version}-%{release}
 %description -n rados-objclass-devel
 This package contains libraries and headers needed to develop RADOS object
 class plugins.
@@ -729,13 +1085,62 @@ populated file-systems.
 
 %endif
 
+%if 0%{with python2}
+%package -n python-ceph-compat
+Summary:	Compatibility package for Cephs python libraries
+%if 0%{?suse_version}
+Group:		Development/Libraries/Python
+%endif
+Obsoletes:	python-ceph
+Requires:	python-rados = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-rbd = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-cephfs = %{_epoch_prefix}%{version}-%{release}
+Requires:	python-rgw = %{_epoch_prefix}%{version}-%{release}
+Provides:	python-ceph
+%description -n python-ceph-compat
+This is a compatibility package to accommodate python-ceph split into
+python-rados, python-rbd, python-rgw and python-cephfs. Packages still
+depending on python-ceph should be fixed to depend on python-rados,
+python-rbd, python-rgw or python-cephfs instead.
+%endif
+
+%package grafana-dashboards
+Summary:	The set of Grafana dashboards for monitoring purposes
+BuildArch:	noarch
+%if 0%{?suse_version}
+Group:		System/Filesystems
+%endif
+%description grafana-dashboards
+This package provides a set of Grafana dashboards for monitoring of
+Ceph clusters. The dashboards require a Prometheus server setup
+collecting data from Ceph Manager "prometheus" module and Prometheus
+project "node_exporter" module. The dashboards are designed to be
+integrated with the Ceph Manager Dashboard web UI.
+
+%if 0%{?suse_version}
+%package prometheus-alerts
+Summary:        Prometheus alerts for a Ceph deplyoment
+BuildArch:      noarch
+Group:          System/Monitoring
+%description prometheus-alerts
+This package provides Ceph’s default alerts for Prometheus.
+%endif
+
 #################################################################################
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-12.2.8
+%autosetup -p1 -n ceph-14.2.15
 
 %build
+# LTO can be enabled as soon as the following GCC bug is fixed:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
+%define _lto_cflags %{nil}
+
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-8/enable
+%endif
+
 %if 0%{with cephfs_java}
 # Find jni.h
 for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
@@ -743,32 +1148,48 @@ for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
 done
 %endif
 
-%if %{with lowmem_builder}
+%if 0%{?suse_version}
+# the following setting fixed an OOM condition we once encountered in the OBS
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
 %endif
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 
 export CPPFLAGS="$java_inc"
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 
-env | sort
-
-%if %{with lowmem_builder}
-%if 0%{?jobs} > 8
-%define _smp_mflags -j8
-%endif
-%endif
+# Parallel build settings ...
+CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
+CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
+%if 0%{?__isa_bits} == 32
+# 32-bit builds can use 3G memory max, which is not enough even for -j2
+CEPH_SMP_NCPUS="1"
+%endif
+# do not eat all memory
+echo "Available memory:"
+free -h
+echo "System limits:"
+ulimit -a
+if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then
+    mem_per_process=2500
+    max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
+    max_jobs="$(($max_mem / $mem_per_process))"
+    test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"
+    test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits"
+fi
+export CEPH_SMP_NCPUS
+export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS"
 
-# unlimit _smp_mflags in system macro if not set above
-%define _smp_ncpus_max 0
-# extract the number of processors for use with cmake
-%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//')
+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} \
@@ -777,13 +1198,14 @@ 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 \
-%if 0%{?rhel} && (! 0%{?centos} || ! 0%{?openEuler})
-    -DWITH_SUBMAN=ON \
+    -DWITH_PYTHON3=%{python3_version} \
+    -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
+%if %{with python2}
+    -DWITH_PYTHON2=ON \
+%else
+    -DWITH_PYTHON2=OFF \
+    -DMGR_PYTHON_VERSION=3 \
 %endif
 %if 0%{without ceph_test_package}
     -DWITH_TESTS=OFF \
@@ -810,22 +1232,38 @@ cmake .. \
 %else
     -DWITH_BOOST_CONTEXT=OFF \
 %endif
-    -DWITH_RDMA=OFF \
-    -DBOOST_J=%{_smp_ncpus}
+%if 0%{with cephfs_shell}
+    -DWITH_CEPHFS_SHELL=ON \
+%endif
+%if 0%{with libradosstriper}
+    -DWITH_LIBRADOSSTRIPER=ON \
+%else
+    -DWITH_LIBRADOSSTRIPER=OFF \
+%endif
+%if 0%{with amqp_endpoint}
+    -DWITH_RADOSGW_AMQP_ENDPOINT=ON \
+%else
+    -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
+%endif
+%if 0%{with kafka_endpoint}
+    -DWITH_RADOSGW_KAFKA_ENDPOINT=ON \
+%else
+    -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
+%endif
+    -DBOOST_J=$CEPH_SMP_NCPUS \
+    -DWITH_GRAFANA=ON
 
-make %{?_smp_mflags}
+taskset -c 0-31 make "$CEPH_MFLAGS_JOBS"
 
 
 %if 0%{with make_check}
 %check
 # run in-tree unittests
 cd build
-ctest %{?_smp_mflags}
-
+ctest "$CEPH_MFLAGS_JOBS"
 %endif
 
 
-
 %install
 pushd build
 make DESTDIR=%{buildroot} install
@@ -837,10 +1275,9 @@ install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
 %endif
 install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
-install -m 0755 -D systemd/ceph %{buildroot}%{_sbindir}/rcceph
 install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
@@ -850,46 +1287,52 @@ install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph
 
 # firewall templates and /sbin/mount.ceph symlink
 %if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
-install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 mkdir -p %{buildroot}/sbin
 ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
 %endif
 
 # 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
 
-rm -f %{buildroot}%{_unitdir}/ceph-mgr@.service
-rm -f %{buildroot}%{_unitdir}/ceph-mgr.target
+# sudoers.d
+install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
+
+%if 0%{?rhel} >= 8 || 0%{?openEuler}
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/*
+%endif
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph
-mkdir -p %{buildroot}/run/ceph
+mkdir -p %{buildroot}%{_localstatedir}/run/ceph
 mkdir -p %{buildroot}%{_localstatedir}/log/ceph
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp
 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
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
 mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
+mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 
 %if 0%{?suse_version}
 # create __pycache__ directories and their contents
 %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
 
-# Remove rpath
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/ceph" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-chrpath --delete %{buildroot}%{_libdir}/librados.so.2.0.0
-chrpath --delete %{buildroot}%{_libdir}/librbd.so.1.12.0
+%if 0%{?rhel} == 8 || 0%{?openEuler}
+%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -900,18 +1343,14 @@ rm -rf %{buildroot}
 %files
 
 %files base
+%{_bindir}/ceph-crash
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
 %{_bindir}/ceph-kvstore-tool
 %{_bindir}/ceph-run
-%if %fixme
-%{_bindir}/ceph-detect-init
-%{_sbindir}/ceph-disk
-%endif
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
-%{_sbindir}/rcceph
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
@@ -921,10 +1360,9 @@ rm -rf %{buildroot}
 %{_libdir}/ceph/erasure-code/libec_*.so*
 %dir %{_libdir}/ceph/compressor
 %{_libdir}/ceph/compressor/libceph_*.so*
-%ifarch x86_64
+%{_unitdir}/ceph-crash.service
 %dir %{_libdir}/ceph/crypto
 %{_libdir}/ceph/crypto/libceph_*.so*
-%endif
 %if %{with lttng}
 %{_libdir}/libos_tp.so*
 %{_libdir}/libosd_tp.so*
@@ -934,85 +1372,87 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/sysconfig/ceph
 %endif
 %if 0%{?suse_version}
-%{_localstatedir}/adm/fillup-templates/sysconfig.*
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
+%{_fillupdir}/sysconfig.*
 %endif
-%{_unitdir}/ceph-disk@.service
 %{_unitdir}/ceph.target
+%if 0%{with python2}
+%dir %{python_sitelib}/ceph_volume
+%{python_sitelib}/ceph_volume/*
+%{python_sitelib}/ceph_volume-*
+%else
+%dir %{python3_sitelib}/ceph_volume
+%{python3_sitelib}/ceph_volume/*
+%{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
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mgr
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd
+%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
 
 %post base
 /sbin/ldconfig
 %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} || 0%{?openEuler}
-%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} || 0%{?openEuler}
-%systemd_preun ceph-disk@\*.service ceph.target
+%systemd_preun ceph.target ceph-crash.service
 %endif
 
 %postun base
 /sbin/ldconfig
-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} || 0%{?openEuler}
-%systemd_postun ceph-disk@\*.service ceph.target
+%systemd_postun ceph.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
   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
 %dir %{_docdir}/ceph
 %doc %{_docdir}/ceph/sample.ceph.conf
-%doc %{_docdir}/ceph/COPYING
+%license %{_docdir}/ceph/COPYING
 %{_bindir}/ceph
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-conf
 %{_bindir}/ceph-dencoder
 %{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
-%{_bindir}/ceph-crush-location
 %{_bindir}/cephfs-data-scan
 %{_bindir}/cephfs-journal-tool
 %{_bindir}/cephfs-table-tool
@@ -1030,11 +1470,11 @@ fi
 %{_bindir}/rbd-replay-prep
 %endif
 %{_bindir}/ceph-post-file
-%{_bindir}/ceph-brag
 %{_tmpfilesdir}/ceph-common.conf
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-conf.8*
 %{_mandir}/man8/ceph-dencoder.8*
+%{_mandir}/man8/ceph-diff-sorted.8*
 %{_mandir}/man8/ceph-rbdnamer.8*
 %{_mandir}/man8/ceph-syn.8*
 %{_mandir}/man8/ceph-post-file.8*
@@ -1047,6 +1487,7 @@ fi
 %{_mandir}/man8/rbd-replay.8*
 %{_mandir}/man8/rbd-replay-many.8*
 %{_mandir}/man8/rbd-replay-prep.8*
+%{_mandir}/man8/rgw-orphan-list.8*
 %dir %{_datadir}/ceph/
 %{_datadir}/ceph/known_hosts_drop.ceph.com
 %{_datadir}/ceph/id_rsa_drop.ceph.com
@@ -1128,7 +1569,6 @@ fi
 %endif
 
 %postun mds
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-mds@\*.service ceph-mds.target
@@ -1136,7 +1576,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-mds@\*.service ceph-mds.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1148,10 +1588,36 @@ if [ $FIRST_ARG -ge 1 ] ; then
   fi
 fi
 
-%if %fixme
 %files mgr
 %{_bindir}/ceph-mgr
-%{_libdir}/ceph/mgr
+%dir %{_datadir}/ceph/mgr
+%{_datadir}/ceph/mgr/alerts
+%{_datadir}/ceph/mgr/ansible
+%{_datadir}/ceph/mgr/balancer
+%{_datadir}/ceph/mgr/crash
+%{_datadir}/ceph/mgr/deepsea
+%{_datadir}/ceph/mgr/devicehealth
+%{_datadir}/ceph/mgr/influx
+%{_datadir}/ceph/mgr/insights
+%{_datadir}/ceph/mgr/iostat
+%{_datadir}/ceph/mgr/localpool
+%{_datadir}/ceph/mgr/mgr_module.*
+%{_datadir}/ceph/mgr/mgr_util.*
+%{_datadir}/ceph/mgr/orchestrator_cli
+%{_datadir}/ceph/mgr/orchestrator.*
+%{_datadir}/ceph/mgr/osd_perf_query
+%{_datadir}/ceph/mgr/pg_autoscaler
+%{_datadir}/ceph/mgr/progress
+%{_datadir}/ceph/mgr/prometheus
+%{_datadir}/ceph/mgr/rbd_support
+%{_datadir}/ceph/mgr/restful
+%{_datadir}/ceph/mgr/selftest
+%{_datadir}/ceph/mgr/status
+%{_datadir}/ceph/mgr/telegraf
+%{_datadir}/ceph/mgr/telemetry
+%{_datadir}/ceph/mgr/test_orchestrator
+%{_datadir}/ceph/mgr/volumes
+%{_datadir}/ceph/mgr/zabbix
 %{_unitdir}/ceph-mgr@.service
 %{_unitdir}/ceph-mgr.target
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr
@@ -1178,7 +1644,6 @@ fi
 %endif
 
 %postun mgr
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-mgr@\*.service ceph-mgr.target
@@ -1186,7 +1651,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-mgr@\*.service ceph-mgr.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1197,16 +1662,89 @@ if [ $FIRST_ARG -ge 1 ] ; then
     /usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || :
   fi
 fi
-%endif
+
+%files mgr-dashboard
+%{_datadir}/ceph/mgr/dashboard
+
+%post mgr-dashboard
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-dashboard
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-diskprediction-local
+%{_datadir}/ceph/mgr/diskprediction_local
+
+%post mgr-diskprediction-local
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-diskprediction-local
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-diskprediction-cloud
+%{_datadir}/ceph/mgr/diskprediction_cloud
+
+%post mgr-diskprediction-cloud
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-diskprediction-cloud
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%files mgr-rook
+%{_datadir}/ceph/mgr/rook
+
+%post mgr-rook
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-rook
+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
+
+%post mgr-ssh
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
+
+%postun mgr-ssh
+if [ $1 -eq 1 ] ; then
+    /usr/bin/systemctl try-restart ceph-mgr.target >/dev/null 2>&1 || :
+fi
 
 %files mon
 %{_bindir}/ceph-mon
-%{_bindir}/ceph-rest-api
 %{_bindir}/ceph-monstore-tool
 %{_mandir}/man8/ceph-mon.8*
-%{_mandir}/man8/ceph-rest-api.8*
-%{python3_sitelib}/ceph_rest_api.py*            
-%{python3_sitelib}/__pycache__/*
 %{_unitdir}/ceph-mon@.service
 %{_unitdir}/ceph-mon.target
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
@@ -1233,7 +1771,6 @@ fi
 %endif
 
 %postun mon
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-mon@\*.service ceph-mon.target
@@ -1241,7 +1778,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-mon@\*.service ceph-mon.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1292,7 +1829,6 @@ fi
 %endif
 
 %postun -n rbd-mirror
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
@@ -1300,7 +1836,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-rbd-mirror@\*.service ceph-rbd-mirror.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1317,10 +1853,12 @@ fi
 %{_mandir}/man8/rbd-nbd.8*
 
 %files radosgw
+%{_bindir}/ceph-diff-sorted
 %{_bindir}/radosgw
 %{_bindir}/radosgw-token
 %{_bindir}/radosgw-es
 %{_bindir}/radosgw-object-expirer
+%{_bindir}/rgw-orphan-list
 %{_mandir}/man8/radosgw.8*
 %dir %{_localstatedir}/lib/ceph/radosgw
 %{_unitdir}/ceph-radosgw@.service
@@ -1348,7 +1886,6 @@ fi
 %endif
 
 %postun radosgw
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-radosgw@\*.service ceph-radosgw.target
@@ -1356,7 +1893,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-radosgw@\*.service ceph-radosgw.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1375,26 +1912,19 @@ 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
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-osd.8*
 %{_mandir}/man8/ceph-bluestore-tool.8*
 %{_mandir}/man8/ceph-volume.8*
 %{_mandir}/man8/ceph-volume-systemd.8*
-%if 0%{?rhel} && (! 0%{?centos} && ! 0%{?openEuler})
-%attr(0755,-,-) %{_sysconfdir}/cron.hourly/subman
-%endif
 %{_unitdir}/ceph-osd@.service
 %{_unitdir}/ceph-osd.target
 %{_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}
@@ -1413,8 +1943,6 @@ fi
 %else
     /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || :
 %endif
-# work around https://tracker.ceph.com/issues/24903
-chown -f -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 
 %preun osd
 %if 0%{?suse_version}
@@ -1425,7 +1953,6 @@ chown -f -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 %endif
 
 %postun osd
-test -n "$FIRST_ARG" || FIRST_ARG=$1
 %if 0%{?suse_version}
 DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
@@ -1433,7 +1960,7 @@ DISABLE_RESTART_ON_UPDATE="yes"
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 %systemd_postun ceph-osd@\*.service ceph-volume@\*.service ceph-osd.target
 %endif
-if [ $FIRST_ARG -ge 1 ] ; then
+if [ $1 -ge 1 ] ; then
   # Restart on upgrade, but only if "CEPH_AUTO_RESTART_ON_UPGRADE" is set to
   # "yes". In any case: if units are not running, do not touch them.
   SYSCONF_CEPH=%{_sysconfdir}/sysconfig/ceph
@@ -1458,11 +1985,11 @@ fi
 %files -n librados2
 %{_libdir}/librados.so.*
 %dir %{_libdir}/ceph
-%{_libdir}/ceph/libceph-common.so*
+%{_libdir}/ceph/libceph-common.so.*
 %if %{with lttng}
 %{_libdir}/librados_tp.so.*
 %endif
-%config /etc/ld.so.conf.d/*
+%dir %{_sysconfdir}/ceph
 
 %post -n librados2 -p /sbin/ldconfig
 
@@ -1471,15 +1998,7 @@ fi
 %files -n librados-devel
 %dir %{_includedir}/rados
 %{_includedir}/rados/librados.h
-%{_includedir}/rados/librados.hpp
-%{_includedir}/rados/buffer.h
-%{_includedir}/rados/buffer_fwd.h
-%{_includedir}/rados/inline_memory.h
-%{_includedir}/rados/page.h
-%{_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
@@ -1487,10 +2006,28 @@ fi
 %{_bindir}/librados-config
 %{_mandir}/man8/librados-config.8*
 
+%files -n libradospp-devel
+%dir %{_includedir}/rados
+%{_includedir}/rados/buffer.h
+%{_includedir}/rados/buffer_fwd.h
+%{_includedir}/rados/crc32c.h
+%{_includedir}/rados/inline_memory.h
+%{_includedir}/rados/librados.hpp
+%{_includedir}/rados/librados_fwd.hpp
+%{_includedir}/rados/page.h
+%{_includedir}/rados/rados_types.hpp
+
+%if 0%{with python2}
+%files -n python-rados
+%{python_sitearch}/rados.so
+%{python_sitearch}/rados-*.egg-info
+%endif
+
 %files -n python%{python3_pkgversion}-rados
 %{python3_sitearch}/rados.cpython*.so
 %{python3_sitearch}/rados-*.egg-info
 
+%if 0%{with libradosstriper}
 %files -n libradosstriper1
 %{_libdir}/libradosstriper.so.*
 
@@ -1503,6 +2040,7 @@ fi
 %{_includedir}/radosstriper/libradosstriper.h
 %{_includedir}/radosstriper/libradosstriper.hpp
 %{_libdir}/libradosstriper.so
+%endif
 
 %files -n librbd1
 %{_libdir}/librbd.so.*
@@ -1526,6 +2064,11 @@ 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.*
+%endif
 
 %post -n librgw2 -p /sbin/ldconfig
 
@@ -1534,19 +2077,38 @@ 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 %{with lttng}
+%{_libdir}/librgw_op_tp.so
+%{_libdir}/librgw_rados_tp.so
+%endif
+
+%if 0%{with python2}
+%files -n python-rgw
+%{python_sitearch}/rgw.so
+%{python_sitearch}/rgw-*.egg-info
+%endif
 
 %files -n python%{python3_pkgversion}-rgw
 %{python3_sitearch}/rgw.cpython*.so
 %{python3_sitearch}/rgw-*.egg-info
 
+%if 0%{with python2}
+%files -n python-rbd
+%{python_sitearch}/rbd.so
+%{python_sitearch}/rbd-*.egg-info
+%endif
+
 %files -n python%{python3_pkgversion}-rbd
 %{python3_sitearch}/rbd.cpython*.so
 %{python3_sitearch}/rbd-*.egg-info
 
 %files -n libcephfs2
 %{_libdir}/libcephfs.so.*
+%dir %{_sysconfdir}/ceph
 
 %post -n libcephfs2 -p /sbin/ldconfig
 
@@ -1555,21 +2117,40 @@ fi
 %files -n libcephfs-devel
 %dir %{_includedir}/cephfs
 %{_includedir}/cephfs/libcephfs.h
-%{_includedir}/cephfs/ceph_statx.h
+%{_includedir}/cephfs/ceph_ll_client.h
 %{_libdir}/libcephfs.so
 
+%if 0%{with python2}
+%files -n python-cephfs
+%{python_sitearch}/cephfs.so
+%{python_sitearch}/cephfs-*.egg-info
+%{python_sitelib}/ceph_volume_client.py*
+%endif
+
 %files -n python%{python3_pkgversion}-cephfs
 %{python3_sitearch}/cephfs.cpython*.so
 %{python3_sitearch}/cephfs-*.egg-info
 %{python3_sitelib}/ceph_volume_client.py
 %{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}
 %files -n ceph-test
 %{_bindir}/ceph-client-debug
@@ -1590,15 +2171,10 @@ fi
 %{_bindir}/ceph_rgw_multiparser
 %{_bindir}/ceph_scratchtool
 %{_bindir}/ceph_scratchtoolpp
-%{_bindir}/ceph_smalliobench
-%{_bindir}/ceph_smalliobenchdumb
-%{_bindir}/ceph_smalliobenchfs
-%{_bindir}/ceph_smalliobenchrbd
 %{_bindir}/ceph_test_*
-%{_bindir}/ceph_tpbench
-%{_bindir}/ceph_xattr_bench
 %{_bindir}/ceph-coverage
 %{_bindir}/ceph-debugpack
+%{_bindir}/cephdeduptool
 %{_mandir}/man8/ceph-debugpack.8*
 %dir %{_libdir}/ceph
 %{_libdir}/ceph/ceph-monstore-update-crush.sh
@@ -1659,17 +2235,12 @@ if test $STATUS -eq 0; then
     /usr/bin/systemctl stop ceph.target > /dev/null 2>&1
 fi
 
-# Relabel the files
-# Use ceph-disk fix for first package install and fixfiles otherwise
-if [ "$1" = "1" ]; then
-    /usr/sbin/ceph-disk fix --selinux
-else
-    /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
-fi
+# Relabel the files fix for first package install
+/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
 
 rm -f ${FILE_CONTEXT}.pre
 # The fixfiles command won't fix label for /var/run/ceph
-/usr/sbin/restorecon -R /run/ceph > /dev/null 2>&1
+/usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1
 
 # Start the daemons iff they were running before
 if test $STATUS -eq 0; then
@@ -1705,7 +2276,7 @@ if [ $1 -eq 0 ]; then
     /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
     rm -f ${FILE_CONTEXT}.pre
     # The fixfiles command won't fix label for /var/run/ceph
-    /usr/sbin/restorecon -R /run/ceph > /dev/null 2>&1
+    /usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1
 
     # Start the daemons if they were running before
     if test $STATUS -eq 0; then
@@ -1713,10 +2284,38 @@ if [ $1 -eq 0 ]; then
     fi
 fi
 exit 0
+%endif
+
+%if 0%{with python2}
+%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
+
+%files grafana-dashboards
+%if 0%{?suse_version}
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%else
+%attr(0755,root,root) %dir %{_sysconfdir}/grafana/dashboards/ceph-dashboard
+%endif
+%config %{_sysconfdir}/grafana/dashboards/ceph-dashboard/*
+%doc monitoring/grafana/dashboards/README
+%doc monitoring/grafana/README.md
+
+%if 0%{?suse_version}
+%files prometheus-alerts
+%dir /etc/prometheus/SUSE/
+%dir /etc/prometheus/SUSE/default_rules/
+%config /etc/prometheus/SUSE/default_rules/ceph_default_alerts.yml
+%endif
 
-%endif # with selinux
 
 %changelog
+* Fri Jan 22 2021 yanglongkang <yanglongkang@huawei.com> - 1:14.2.15-1
+- update to 14.2.15
+
 * Thu Nov 20 2020 yanglongkang <yanglongkang@huawei.com> - 1:12.2.8-9
 - remove python2 dependency