openstack/barbican
Code Issues Proposed changes

Merge "Fix kmip plugin"

Browse Source
This commit is contained in:
Jenkins 2017-03-05 05:21:41 +00:00 committed by Gerrit Code Review
commit 12df452882
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
barbican/plugin/kmip_secret_store.py
View File

@ -56,12 +56,12 @@ kmip_opts = [
default='localhost', default='localhost',
help=u._('Address of the KMIP server') help=u._('Address of the KMIP server')
), ),
cfg.StrOpt('port', cfg.IntOpt('port',
default='5696', default=5696,
help=u._('Port for the KMIP server'), help=u._('Port for the KMIP server'),
), ),
cfg.StrOpt('ssl_version', cfg.StrOpt('ssl_version',
default='PROTOCOL_TLSv1', default='PROTOCOL_TLSv1_2',
help=u._('SSL version, maps to the module ssl\'s constants'), help=u._('SSL version, maps to the module ssl\'s constants'),
), ),
cfg.StrOpt('ca_certs', cfg.StrOpt('ca_certs',

6
etc/barbican/barbican.conf
View File

@ -316,9 +316,9 @@ port = 5696
keyfile = '/path/to/certs/cert.key' keyfile = '/path/to/certs/cert.key'
certfile = '/path/to/certs/cert.crt' certfile = '/path/to/certs/cert.crt'
ca_certs = '/path/to/certs/LocalCA.crt' ca_certs = '/path/to/certs/LocalCA.crt'
ssl_version = 'PROTOCOL_TLSv1_2'
# User friendly plugin name pkcs1_only = False
# plugin_name = 'KMIP HSM' plugin_name = 'KMIP HSM'
# ================= Certificate plugin =================== # ================= Certificate plugin ===================