From ce5aa7dccad4b95db6758c988287a07574ddb918 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 28 Feb 2022 01:23:14 +0900 Subject: [PATCH] oslo-config-generator: Fix ValueError This fixes how the opts data is formatted to fix auto-generation of config file using oslo-config-generator with oslo.limit entry point. Closes-Bug: #1962406 Change-Id: I176a7b2b8e2edb50659783a2139c3cc13e8f2f53 --- oslo_limit/opts.py | 6 +++--- releasenotes/notes/bug-1962406-e239d60400c726c8.yaml | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/bug-1962406-e239d60400c726c8.yaml diff --git a/oslo_limit/opts.py b/oslo_limit/opts.py index b944649..c23e627 100644 --- a/oslo_limit/opts.py +++ b/oslo_limit/opts.py @@ -44,9 +44,9 @@ def list_opts(): return [(_option_group, copy.deepcopy(_options) + loading.get_session_conf_options() + - loading.get_auth_plugin_conf_options('password'), - loading.get_auth_plugin_conf_options('v2password'), - loading.get_auth_plugin_conf_options('v3password'), + loading.get_auth_plugin_conf_options('password') + + loading.get_auth_plugin_conf_options('v2password') + + loading.get_auth_plugin_conf_options('v3password') + loading.get_adapter_conf_options(include_deprecated=False) )] diff --git a/releasenotes/notes/bug-1962406-e239d60400c726c8.yaml b/releasenotes/notes/bug-1962406-e239d60400c726c8.yaml new file mode 100644 index 0000000..548bbec --- /dev/null +++ b/releasenotes/notes/bug-1962406-e239d60400c726c8.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + `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.