openstack
/
octavia
Code Issues Proposed changes

Merge "Fix comment for the ca_certificates_file opt" into stable/wallaby

This commit is contained in:
Zuul 2021-06-08 16:51:27 +00:00 committed by Gerrit Code Review
parent f0cb85cd81 20db85fd52
commit b1f98d72c8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/octavia.conf
View File

@ -164,13 +164,21 @@
# cert_manager = barbican_cert_manager # cert_manager = barbican_cert_manager
# For Barbican authentication (if using any Barbican based cert class) # For Barbican authentication (if using any Barbican based cert class)
# barbican_auth = barbican_acl_auth # barbican_auth = barbican_acl_auth
#
# Region in Identity service catalog to use for communication with the Barbican service. # Settings for the key manager endpoint (such as Barbican)
# Region in Identity service catalog to use for communication with the key manager service.
# region_name = # region_name =
#
# Endpoint type to use for communication with the Barbican service. # Endpoint type to use for communication with the key manager service.
# endpoint_type = publicURL # endpoint_type = publicURL
# CA certificates file to verify key manager connections when TLS is enabled
# ca_certificates_file =
# Disable certificate validation on SSL connections
# insecure = False
[compute] [compute]
# The maximum attempts to retry an action with the compute service. # The maximum attempts to retry an action with the compute service.
# max_retries = 15 # max_retries = 15

3
octavia/common/config.py
View File

@ -609,7 +609,8 @@ certificate_opts = [
default='publicURL', default='publicURL',
help='The endpoint_type to be used for barbican service.'), help='The endpoint_type to be used for barbican service.'),
cfg.StrOpt('ca_certificates_file', cfg.StrOpt('ca_certificates_file',
help=_('CA certificates file path')), help=_('CA certificates file path for the key manager service '
'(such as Barbican).')),
cfg.BoolOpt('insecure', cfg.BoolOpt('insecure',
default=False, default=False,
help=_('Disable certificate validation on SSL connections ')), help=_('Disable certificate validation on SSL connections ')),