openstack/heat
Code Issues Proposed changes

Do not import osprofiler options

Browse Source 
... but directly use the list provided by the library.

Change-Id: I892968fa55e805f55787513ca67785526b10523a
This commit is contained in:
Takashi Kajinami 2024-10-27 02:28:54 +09:00
parent 45d30827e5
commit 7cf9e32977
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,3 +23,4 @@ namespace = oslo.service.service
namespace = oslo.service.periodic_task namespace = oslo.service.periodic_task
namespace = oslo.service.sslutils namespace = oslo.service.sslutils
namespace = oslo.versionedobjects namespace = oslo.versionedobjects
namespace = osprofiler

4
heat/common/config.py
View File

@ -473,7 +473,6 @@ def list_opts():
yield revision_group.name, revision_opts yield revision_group.name, revision_opts
yield volumes_group.name, volumes_opts yield volumes_group.name, volumes_opts
yield noauth_group.name, noauth_opts yield noauth_group.name, noauth_opts
yield profiler.list_opts()[0]
yield 'clients', default_clients_opts yield 'clients', default_clients_opts
for client in ('aodh', 'barbican', 'cinder', 'designate', for client in ('aodh', 'barbican', 'cinder', 'designate',
@ -494,7 +493,6 @@ def list_opts():
cfg.CONF.register_group(paste_deploy_group) cfg.CONF.register_group(paste_deploy_group)
cfg.CONF.register_group(auth_password_group) cfg.CONF.register_group(auth_password_group)
cfg.CONF.register_group(revision_group) cfg.CONF.register_group(revision_group)
profiler.set_defaults(cfg.CONF)
for group, opts in list_opts(): for group, opts in list_opts():
cfg.CONF.register_opts(opts, group=group) cfg.CONF.register_opts(opts, group=group)
@ -618,3 +616,5 @@ def set_config_defaults():
# once oslo_policy change the default value to 'policy.yaml'. # once oslo_policy change the default value to 'policy.yaml'.
# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49 # https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49
policy_opts.set_defaults(cfg.CONF, 'policy.yaml') policy_opts.set_defaults(cfg.CONF, 'policy.yaml')
profiler.set_defaults(cfg.CONF)