Merge "Remove dumplicated config option 'cert_generator'"

This commit is contained in:
Jenkins 2017-01-19 23:45:27 +00:00 committed by Gerrit Code Review
commit e8c6f4e90f
5 changed files with 9 additions and 10 deletions

View File

@ -12,7 +12,7 @@ Basic Setup
# Change the listening port in config.py to 9999
# I found it useful to run anchor in an additional devstack screen
# Set in octavia.conf
## [controller_worker] cert_generator to anchor
## [certificates] cert_generator to anchor
## [haproxy_amphora] server_ca = /opt/stack/anchor/CA/root-ca.crt (Anchor CA)
# Restart o-cw o-hm o-hk

View File

@ -70,6 +70,8 @@
# cafile =
[certificates]
# Certificate Generator options are local_cert_generator
# anchor_cert_generator
# cert_generator = local_cert_generator
# For local certificate signing (development only):
@ -188,11 +190,6 @@
#
# network_driver = network_noop_driver
#
# Certificate Generator options are local_cert_generator
# barbican_cert_generator
# anchor_cert_generator
# cert_generator = local_cert_generator
#
# Load balancer topology options are SINGLE, ACTIVE_STANDBY
# loadbalancer_topology = SINGLE
# user_data_config_drive = False

View File

@ -261,9 +261,6 @@ controller_worker_opts = [
cfg.StrOpt('network_driver',
default='network_noop_driver',
help=_('Name of the network driver to use')),
cfg.StrOpt('cert_generator',
default='local_cert_generator',
help=_('Name of the cert generator to use')),
cfg.StrOpt('loadbalancer_topology',
default=constants.TOPOLOGY_SINGLE,
choices=constants.SUPPORTED_LB_TOPOLOGIES,

View File

@ -29,7 +29,7 @@ class BaseCertTask(task.Task):
super(BaseCertTask, self).__init__(**kwargs)
self.cert_generator = stevedore_driver.DriverManager(
namespace='octavia.cert_generator',
name=CONF.controller_worker.cert_generator,
name=CONF.certificates.cert_generator,
invoke_on_load=True,
).driver

View File

@ -0,0 +1,5 @@
---
upgrade:
- Remove dumplicated config option 'cert_generator'
in [controller_worker]. Operators now should set it
under [certificates].