openstack
/
octavia
Code Issues Proposed changes

Merge "Pass config to castellan"

This commit is contained in:
Zuul 2022-12-12 17:58:13 +00:00 committed by Gerrit Code Review
parent e0d217665b f5ac714a7b
commit 4ba956ecf2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/config/octavia-config-generator.conf
View File

@ -13,3 +13,4 @@ namespace = oslo.policy
namespace = keystonemiddleware.audit
namespace = keystonemiddleware.auth_token
namespace = cotyledon
namespace = castellan.config

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 import key_manager
from OpenSSL import crypto
from oslo_config import cfg
from oslo_log import log as logging
from octavia.certificates.common import pkcs12
from octavia.certificates.manager import cert_mgr
from octavia.common import exceptions
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
@ -33,7 +36,7 @@ class CastellanCertManager(cert_mgr.CertManager):
def __init__(self):
super().__init__()
self.manager = key_manager.API()
self.manager = key_manager.API(CONF)
def store_cert(self, context, certificate, private_key, intermediates=None,
private_key_passphrase=None, expiration=None,