Merge "oslo-config-generator: Fix ValueError"

This commit is contained in:
Zuul 2022-03-08 18:37:58 +00:00 committed by Gerrit Code Review
commit 45e01c9071
2 changed files with 10 additions and 3 deletions

View File

@ -44,9 +44,9 @@ def list_opts():
return [(_option_group, return [(_option_group,
copy.deepcopy(_options) + copy.deepcopy(_options) +
loading.get_session_conf_options() + loading.get_session_conf_options() +
loading.get_auth_plugin_conf_options('password'), loading.get_auth_plugin_conf_options('password') +
loading.get_auth_plugin_conf_options('v2password'), loading.get_auth_plugin_conf_options('v2password') +
loading.get_auth_plugin_conf_options('v3password'), loading.get_auth_plugin_conf_options('v3password') +
loading.get_adapter_conf_options(include_deprecated=False) loading.get_adapter_conf_options(include_deprecated=False)
)] )]

View File

@ -0,0 +1,7 @@
---
fixes:
- |
`bug 1962406` <https://bugs.launchpad.net/oslo.limit/+bug/1962406>`_:
Fixed the wrong format of options data, which was causing failure with
``oslo-config-generator`` command if the ``oslo.limit`` entry point is
included.