Merge tag '1.5.1' into debian/yoga

oslo.limit 1.5.1 release

meta:version: 1.5.1
meta:diff-start: -
meta:series: yoga
meta:release-type: release
meta:pypi: yes
meta:first: no
meta:release:Author: Hervé Beraud <hberaud@redhat.com>
meta:release:Commit: Hervé Beraud <hberaud@redhat.com>
meta:release:Change-Id: Ib493c2bd32c1bcef28d971724442abc2a2690b66
meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org>
meta:release:Code-Review+2: Elod Illes <elod.illes@est.tech>
meta:release:Workflow+1: Elod Illes <elod.illes@est.tech>

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/oslo.limit.git
+defaultbranch=stable/yoga

doc/source/conf.py

@@ -21,7 +21,8 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'openstackdocstheme',
-    'sphinxcontrib.apidoc'
+    'sphinxcontrib.apidoc',
+    'oslo_config.sphinxext',
 ]
 
 apidoc_module_dir = '../../oslo_limit'

doc/source/reference/index.rst

-========================
-oslo.limit API Reference
-========================
+=========
+Reference
+=========
 
 .. toctree::
+   :maxdepth: 2
+
+   opts
+
+API
+===
+
+.. toctree::
+   :maxdepth: 1
 
    api/modules

doc/source/reference/opts.rst

+=====================
+Configuration Options
+=====================
+
+oslo.limit uses oslo.config to define and manage configuration
+options to allow the deployer to control how an application uses the
+underlying quota limits and enforcement.
+
+.. show-options:: oslo.limit

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)
              )]
 

releasenotes/notes/bug-1962406-e239d60400c726c8.yaml

+---
+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.

tox.ini

@@ -6,7 +6,7 @@ ignore_basepython_conflict = true
 [testenv]
 basepython = python3
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands =
@@ -26,7 +26,7 @@ commands = {posargs}
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/doc/requirements.txt
 allowlist_externals = rm
 commands =