From adb59a79e9dd1e608820615957b41596af30a7e0 Mon Sep 17 00:00:00 2001 From: bhagyashris Date: Thu, 23 Jun 2016 12:40:02 +0530 Subject: [PATCH] Fix typo 'olso' to 'oslo' TrivialFix Change-Id: I644bc36e3bf804c7546034ec8788671bd7cd01e6 --- doc/source/middlewarearchitecture.rst | 2 +- keystonemiddleware/tests/unit/auth_token/test_config.py | 2 +- ...uthprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/middlewarearchitecture.rst b/doc/source/middlewarearchitecture.rst index c573519b..1fa46446 100644 --- a/doc/source/middlewarearchitecture.rst +++ b/doc/source/middlewarearchitecture.rst @@ -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. 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. Optionally the location of the configuration file can be set if oslo.config is not able to discover it. diff --git a/keystonemiddleware/tests/unit/auth_token/test_config.py b/keystonemiddleware/tests/unit/auth_token/test_config.py index 2fccffa5..8cfa35d4 100644 --- a/keystonemiddleware/tests/unit/auth_token/test_config.py +++ b/keystonemiddleware/tests/unit/auth_token/test_config.py @@ -99,7 +99,7 @@ class TestAuthPluginLocalOsloConfig(base.BaseAuthTokenTestCase): self.assertEqual(self.oslo_options[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.""" conf = {'oslo_config_project': self.project, 'oslo_config_config': self.local_oslo_config, diff --git a/releasenotes/notes/authprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml b/releasenotes/notes/authprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml index c844833b..6dd4ecba 100644 --- a/releasenotes/notes/authprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml +++ b/releasenotes/notes/authprotocol-accepts-oslo-config-config-a37212b60f58e154.yaml @@ -4,7 +4,7 @@ features: [`bug 1540022 `_] 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 `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 are instantiating the auth_token middleware themselves and wish to use an existing configuration.