openstack/cinder
Code Issues Proposed changes

Merge "Update Volume Encryption Documentation"

Browse Source
This commit is contained in:
Zuul 2018-01-22 22:09:49 +00:00 committed by Gerrit Code Review
commit 71b869cf1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/configuration/block-storage/volume-encryption.rst
View File

@ -23,7 +23,7 @@ Steps to update ``cinder-api`` servers:
.. code-block:: ini .. code-block:: ini
api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager backend = barbican
#. Restart ``cinder-api``. #. Restart ``cinder-api``.
@ -37,7 +37,7 @@ Update ``nova-compute`` servers:
.. code-block:: ini .. code-block:: ini
[key_manager] [key_manager]
api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager backend = barbican
.. note:: .. note::

2
doc/source/configuration/tables/cinder-common.inc
View File

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