DNM: Use dedicated ConfigOpts instance
Depends-on: https://review.opendev.org/c/openstack/devstack/+/904335 Change-Id: Ib3358bc2b04789860442f5fea5d18781b8024f61
This commit is contained in:
parent
0c5de2df50
commit
292b215cd7
|
@ -169,18 +169,16 @@ class Swift(object):
|
|||
if extra_config_dirs is not None:
|
||||
extra_config_dirs = list_from_csv(extra_config_dirs)
|
||||
|
||||
try:
|
||||
CONF(args=[], default_config_files=extra_config_files,
|
||||
default_config_dirs=extra_config_dirs)
|
||||
except cfg.RequiredOptError:
|
||||
# When authtoken middleware is enabled, CONF.__call__ fails because
|
||||
# the required [keystone_authtoken] auth_url option is not set.
|
||||
pass
|
||||
oslo_conf = cfg.ConfigOpts()
|
||||
oslo_conf([], project='swift',
|
||||
default_config_files=extra_config_files,
|
||||
default_config_dirs=extra_config_dirs,
|
||||
validate_default_values=True)
|
||||
|
||||
oslo_messaging.set_transport_defaults(conf.get('control_exchange',
|
||||
'swift'))
|
||||
self._notifier = oslo_messaging.Notifier(
|
||||
oslo_messaging.get_notification_transport(CONF,
|
||||
oslo_messaging.get_notification_transport(oslo_conf,
|
||||
url=conf.get('url')),
|
||||
publisher_id='ceilometermiddleware',
|
||||
driver=conf.get('driver', 'messagingv2'),
|
||||
|
|
Loading…
Reference in New Issue