openstack/octavia
Code Issues Proposed changes

Pass config to castellan

Browse Source 
Currently castellan can't be configured through octavia.conf as
conf is not passed while initializing backend.

Also document castellan configuration options in reference.

Change-Id: I30b81866989c22b94fb77e62e7abd180f0f0af50
This commit is contained in:
Dmitriy Rabotyagov 2022-02-02 11:36:14 +02:00
parent 95adbbe618
commit f5ac714a7b
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.audit
namespace = keystonemiddleware.auth_token namespace = keystonemiddleware.auth_token
namespace = cotyledon 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.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,