openstack/keystonemiddleware
Code Issues Proposed changes

Fix typo 'olso' to 'oslo'

Browse Source 
TrivialFix

Change-Id: I644bc36e3bf804c7546034ec8788671bd7cd01e6
This commit is contained in:
bhagyashris 2016-06-23 12:40:02 +05:30
parent 31c8582f39
commit adb59a79e9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/middlewarearchitecture.rst
View File

@ -180,7 +180,7 @@ when ``auth_plugin`` is set to ``password``.
# Any of the options that could be set in api-paste.ini can be set here. # Any of the options that could be set in api-paste.ini can be set here.
If the service doesn't use the global oslo.config object (CONF), then the If the service doesn't use the global oslo.config object (CONF), then the
olso config project name can be set it in paste config and oslo config project name can be set it in paste config and
keystonemiddleware will load the project configuration itself. keystonemiddleware will load the project configuration itself.
Optionally the location of the configuration file can be set if oslo.config Optionally the location of the configuration file can be set if oslo.config
is not able to discover it. is not able to discover it.

2
keystonemiddleware/tests/unit/auth_token/test_config.py
View File

@ -99,7 +99,7 @@ class TestAuthPluginLocalOsloConfig(base.BaseAuthTokenTestCase):
self.assertEqual(self.oslo_options[option], self.assertEqual(self.oslo_options[option],
conf_get(app, option)) conf_get(app, option))
def test_passed_olso_configuration_wins(self): def test_passed_oslo_configuration_wins(self):
"""oslo_config_config has precedence over oslo_config_project.""" """oslo_config_config has precedence over oslo_config_project."""
conf = {'oslo_config_project': self.project, conf = {'oslo_config_project': self.project,
'oslo_config_config': self.local_oslo_config, 'oslo_config_config': self.local_oslo_config,

2
releasenotes/notes/authprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml
View File

@ -4,7 +4,7 @@ features:
[`bug 1540022 <https://bugs.launchpad.net/keystonemiddleware/+bug/1540022>`_] [`bug 1540022 <https://bugs.launchpad.net/keystonemiddleware/+bug/1540022>`_]
The auth_token middleware will now accept a conf setting named The auth_token middleware will now accept a conf setting named
``oslo_config_config``. If this is set its value must be an existing ``oslo_config_config``. If this is set its value must be an existing
oslo_config `ConfigOpts`. ``olso_config_config`` takes precedence over oslo_config `ConfigOpts`. ``oslo_config_config`` takes precedence over
``oslo_config_project``. This feature is useful to applications that ``oslo_config_project``. This feature is useful to applications that
are instantiating the auth_token middleware themselves and wish to are instantiating the auth_token middleware themselves and wish to
use an existing configuration. use an existing configuration.