Merge PR #40094 into pacific

* refs/pull/40094/head:
	rgw/kms/vault - PendingReleaseNotes pointer
	rgw/kms/vault - s3tests for both old and new test logic.
	rgw/kms/vault - rework unit test logic for new transit logic.
	rgw/kms/vault - 0 terminate before rapidjson
	rgw/kms/vault - document configuration for new transit logic
	rgw/kms/vault - new transit logic - fix compat logic
	rgw/kms/vault - define attribute for new transit logic
	rgw/kms/vault - "compat" option
	rgw/kms/vault - encryption context - first part
	rgw/kms/vault - define attribute to store encryption context
	rgw/kms/vault - share get/set attr between rgw_crypt.cc and rgw_kms.cc
	rgw/kms/vault - relax configuration parsing for rgw_crypt_vault_secret_engine
	rgw/kms/vault - need libicu to make canonical json for encryption contexts.
	rgw/kms/kmip - document configuration for a new feature: kmip kms
	rgw/kms/kmip - rgw / kmip test integration.
	rgw/kms/kmip - rgw / kmip test integration.
	rgw/kms/kmip - rgw / kmip test integration.
	rgw/kms/kmip - correct documentation.
	rgw/kms/kmip - pykmip.py needs to make keys too.
	rgw/kms/kmip - pykmip.py should actually run pykmip.
	rgw/kms/kmip - python3 changes for testing.
	rgw/kms/kmip - string handling cleanup.
	teuthology/rgw: pykmip task
	kmip: first pass at implementation logic.
	kmip: configuration options.
	Including cmake build logic inside of libkmip.
	cmake glue to build libkmip.
	Added libkmip as a submodule.

Reviewed-by: Casey Bodley <cbodley@redhat.com>

diff --cc PendingReleaseNotes
index 463d2951c63ff2d82cd6a4a7384fb4870bc19397,1fab694eb2c89211bcf00a6e2629ac5355703b28..b000aed4cde2a9439184e91b03636c0634d21a5f
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -60,14 -66,30 +60,37 @@@
  * librbd: The shared, read-only parent cache's config option ``immutable_object_cache_watermark`` now has been updated
    to property reflect the upper cache utilization before space is reclaimed. The default ``immutable_object_cache_watermark``
    now is ``0.9``. If the capacity reaches 90% the daemon will delete cold cache.
+ * The ceph_volume_client.py library used for manipulating legacy "volumes" in
+   CephFS is removed. All remaining users should use the "fs volume" interface
+   exposed by the ceph-mgr:
+   https://docs.ceph.com/en/latest/cephfs/fs-volumes/
+ 
+ * An AWS-compliant API: "GetTopicAttributes" was added to replace the existing 
+   "GetTopic" API. The new API should be used to fetch information about topics 
+   used for bucket notifications.
+ 
+ * librbd: The shared, read-only parent cache's config option 
+   ``immutable_object_cache_watermark`` has now been updated to properly reflect 
+   the upper cache utilization before space is reclaimed. The default 
+   ``immutable_object_cache_watermark`` is now ``0.9``. If the capacity reaches 
+   90% the daemon will delete cold cache.
+ 
+ * OSD: the option ``osd_fast_shutdown_notify_mon`` has been introduced to allow
+   the OSD to notify the monitor it is shutting down even if ``osd_fast_shutdown``
+   is enabled. This helps with the monitor logs on larger clusters, that may get
+   many 'osd.X reported immediately failed by osd.Y' messages, and confuse tools.
+ * rgw/kms/vault: the transit logic has been revamped to better use
+   the transit engine in vault.  To take advantage of this new
+   functionality configuration changes are required.  See the current
+   documentation (radosgw/vault) for more details.
  
 +* Scubs are more aggressive in trying to find more simultaneous possible PGs within osd_max_scrubs limitation.
 +  It is possible that increasing osd_scrub_sleep may be necessary to maintain client responsiveness.
 +* OSD: the option ``osd_fast_shutdown_notify_mon`` has been introduced to allow
 +  the OSD to notify the monitor it is shutting down even if ``osd_fast_shutdown``
 +  is enabled. This helps with the monitor logs on larger clusters, that may get
 +  many 'osd.X reported immediately failed by osd.Y' messages, and confuse tools.
 +
  >=15.0.0
  --------
  

diff --cc ceph.spec.in
Simple merge

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge