openstack/octavia
Code Issues Proposed changes

Merge "Pass config to castellan" into stable/wallaby

Browse Source
This commit is contained in:
Zuul
2024-01-23 16:03:26 +00:00
committed by Gerrit Code Review
parent 8cbe692ba2 e19279f8ed
commit 319bc90f28
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
octavia/certificates/manager/castellan_mgr.py
View File

@@ -19,12 +19,15 @@ Cert manager implementation for Castellan
from castellan.common.objects import opaque_data from castellan.common.objects import opaque_data
from castellan import key_manager from castellan import key_manager
from OpenSSL import crypto from OpenSSL import crypto
from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from octavia.certificates.common import pkcs12 from octavia.certificates.common import pkcs12
from octavia.certificates.manager import cert_mgr from octavia.certificates.manager import cert_mgr
from octavia.common import exceptions from octavia.common import exceptions
CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -33,7 +36,7 @@ class CastellanCertManager(cert_mgr.CertManager):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.manager = key_manager.API() self.manager = key_manager.API(CONF)
def store_cert(self, context, certificate, private_key, intermediates=None, def store_cert(self, context, certificate, private_key, intermediates=None,
private_key_passphrase=None, expiration=None, private_key_passphrase=None, expiration=None,

7
releasenotes/notes/octavia_castellan_config-995e65f129e3e983.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
fixes:
- |
Usage of ``castellan_cert_manager`` as cert_manager has been significantly
improved. Now you can define configuration options for castellan in
octavia.conf and they will be passed properly to castellan beckend. This
allows to use allowed castellan backends as for certificate storage.