Merge "Update Volume Encryption Documentation"

2018-01-22 22:09:49 +00:00 · 2018-01-22 22:09:49 +00:00 · 71b869cf1d
commit 71b869cf1d
parent b72e28276c 56b62f9423
2 changed files with 3 additions and 3 deletions
--- a/doc/source/configuration/block-storage/volume-encryption.rst
+++ b/doc/source/configuration/block-storage/volume-encryption.rst
@ -23,7 +23,7 @@ Steps to update ``cinder-api`` servers:

     .. code-block:: ini

-        api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+        backend = barbican

 #. Restart ``cinder-api``.

@ -37,7 +37,7 @@ Update ``nova-compute`` servers:
   .. code-block:: ini

      [key_manager]
-      api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+      backend = barbican

     .. note::

--- a/doc/source/configuration/tables/cinder-common.inc
+++ b/doc/source/configuration/tables/cinder-common.inc
@ -156,7 +156,7 @@
     - (String) DEPRECATED: The path to respond to healtcheck requests on.
   * - **[key_manager]**
     -
-   * - ``backend`` = ``castellan.key_manager.barbican_key_manager.BarbicanKeyManager``
+   * - ``backend`` = ``barbican``
     - (String) The full class name of the key manager API class
   * - ``fixed_key`` = ``None``
     - (String) Fixed key returned by key manager, specified in hex