openstack/trove
Code Issues Proposed changes

Replace "tokenauth" by "authtoken" in configuration files

Browse Source 
This is the standard word used by all other projects.

Change-Id: Ibd52056bd1214f5fd7b2f2fd315086542d34fd0c
Closes-Bug: 1234314
This commit is contained in:
Cyril Roelandt
2013-12-10 15:34:06 +01:00
parent 4790ba1f04
commit cb58f8ca0d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/design.rst
View File

@@ -22,7 +22,7 @@ XML to provision and manage Trove instances.
* A REST-ful component * A REST-ful component
* Entry point - Trove/bin/trove-api * Entry point - Trove/bin/trove-api
* Uses a WSGI launcher configured by Trove/etc/trove/api-paste.ini * Uses a WSGI launcher configured by Trove/etc/trove/api-paste.ini
* Defines the pipeline of filters; tokenauth, ratelimit, etc. * Defines the pipeline of filters; authtoken, ratelimit, etc.
* Defines the app_factory for the troveapp as * Defines the app_factory for the troveapp as
trove.common.api:app_factory trove.common.api:app_factory
* The API class (a wsgi Router) wires the REST paths to the * The API class (a wsgi Router) wires the REST paths to the

4
etc/trove/api-paste.ini
View File

@@ -7,13 +7,13 @@ use = call:trove.common.wsgi:versioned_urlmap
paste.app_factory = trove.versions:app_factory paste.app_factory = trove.versions:app_factory
[pipeline:troveapi] [pipeline:troveapi]
pipeline = faultwrapper tokenauth authorization contextwrapper ratelimit extensions troveapp pipeline = faultwrapper authtoken authorization contextwrapper ratelimit extensions troveapp
#pipeline = debug extensions troveapp #pipeline = debug extensions troveapp
[filter:extensions] [filter:extensions]
paste.filter_factory = trove.common.extensions:factory paste.filter_factory = trove.common.extensions:factory
[filter:tokenauth] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = 127.0.0.1 auth_host = 127.0.0.1
auth_port = 35357 auth_port = 35357

4
etc/trove/api-paste.ini.test
View File

@@ -7,13 +7,13 @@ use = call:trove.common.wsgi:versioned_urlmap
paste.app_factory = trove.versions:app_factory paste.app_factory = trove.versions:app_factory
[pipeline:troveapi] [pipeline:troveapi]
pipeline = faultwrapper tokenauth authorization contextwrapper extensions ratelimit troveapp pipeline = faultwrapper authtoken authorization contextwrapper extensions ratelimit troveapp
#pipeline = debug extensions troveapp #pipeline = debug extensions troveapp
[filter:extensions] [filter:extensions]
paste.filter_factory = trove.common.extensions:factory paste.filter_factory = trove.common.extensions:factory
[filter:tokenauth] [filter:authtoken]
paste.filter_factory = trove.tests.fakes.keystone:filter_factory paste.filter_factory = trove.tests.fakes.keystone:filter_factory
service_protocol = http service_protocol = http
service_host = 127.0.0.1 service_host = 127.0.0.1

4
etc/trove/trove.conf.test
View File

@@ -140,13 +140,13 @@ use = call:trove.common.wsgi:versioned_urlmap
paste.app_factory = trove.versions:app_factory paste.app_factory = trove.versions:app_factory
[pipeline:troveapi] [pipeline:troveapi]
pipeline = faultwrapper tokenauth authorization contextwrapper ratelimit extensions troveapp pipeline = faultwrapper authtoken authorization contextwrapper ratelimit extensions troveapp
# pipeline = debug troveapp # pipeline = debug troveapp
[filter:extensions] [filter:extensions]
paste.filter_factory = trove.common.extensions:factory paste.filter_factory = trove.common.extensions:factory
[filter:tokenauth] [filter:authtoken]
paste.filter_factory = trove.tests.fakes.keystone:filter_factory paste.filter_factory = trove.tests.fakes.keystone:filter_factory
service_protocol = http service_protocol = http
service_host = 127.0.0.1 service_host = 127.0.0.1