Browse Source

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

stable/wallaby
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
b1f98d72c8
2 changed files with 14 additions and 5 deletions
  1. +12
    -4
      etc/octavia.conf
  2. +2
    -1
      octavia/common/config.py

+ 12
- 4
etc/octavia.conf View File

@ -164,13 +164,21 @@
# cert_manager = barbican_cert_manager
# For Barbican authentication (if using any Barbican based cert class)
# 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 =
#
# Endpoint type to use for communication with the Barbican service.
# Endpoint type to use for communication with the key manager service.
# 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]
# The maximum attempts to retry an action with the compute service.
# max_retries = 15


+ 2
- 1
octavia/common/config.py View File

@ -609,7 +609,8 @@ certificate_opts = [
default='publicURL',
help='The endpoint_type to be used for barbican service.'),
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',
default=False,
help=_('Disable certificate validation on SSL connections ')),


Loading…
Cancel
Save