From cb58f8ca0d807cb2ece78afc923f4b2a1d344c2e Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 10 Dec 2013 15:34:06 +0100 Subject: [PATCH] Replace "tokenauth" by "authtoken" in configuration files This is the standard word used by all other projects. Change-Id: Ibd52056bd1214f5fd7b2f2fd315086542d34fd0c Closes-Bug: 1234314 --- doc/source/dev/design.rst | 2 +- etc/trove/api-paste.ini | 4 ++-- etc/trove/api-paste.ini.test | 4 ++-- etc/trove/trove.conf.test | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/source/dev/design.rst b/doc/source/dev/design.rst index 5b63dca431..6b66402517 100644 --- a/doc/source/dev/design.rst +++ b/doc/source/dev/design.rst @@ -22,7 +22,7 @@ XML to provision and manage Trove instances. * A REST-ful component * Entry point - Trove/bin/trove-api * 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 trove.common.api:app_factory * The API class (a wsgi Router) wires the REST paths to the diff --git a/etc/trove/api-paste.ini b/etc/trove/api-paste.ini index 58611e8225..96edbea7af 100644 --- a/etc/trove/api-paste.ini +++ b/etc/trove/api-paste.ini @@ -7,13 +7,13 @@ use = call:trove.common.wsgi:versioned_urlmap paste.app_factory = trove.versions:app_factory [pipeline:troveapi] -pipeline = faultwrapper tokenauth authorization contextwrapper ratelimit extensions troveapp +pipeline = faultwrapper authtoken authorization contextwrapper ratelimit extensions troveapp #pipeline = debug extensions troveapp [filter:extensions] paste.filter_factory = trove.common.extensions:factory -[filter:tokenauth] +[filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory auth_host = 127.0.0.1 auth_port = 35357 diff --git a/etc/trove/api-paste.ini.test b/etc/trove/api-paste.ini.test index d106f2d78f..978a4da53b 100644 --- a/etc/trove/api-paste.ini.test +++ b/etc/trove/api-paste.ini.test @@ -7,13 +7,13 @@ use = call:trove.common.wsgi:versioned_urlmap paste.app_factory = trove.versions:app_factory [pipeline:troveapi] -pipeline = faultwrapper tokenauth authorization contextwrapper extensions ratelimit troveapp +pipeline = faultwrapper authtoken authorization contextwrapper extensions ratelimit troveapp #pipeline = debug extensions troveapp [filter:extensions] paste.filter_factory = trove.common.extensions:factory -[filter:tokenauth] +[filter:authtoken] paste.filter_factory = trove.tests.fakes.keystone:filter_factory service_protocol = http service_host = 127.0.0.1 diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 1b777d80a7..e9f03a4cea 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -140,13 +140,13 @@ use = call:trove.common.wsgi:versioned_urlmap paste.app_factory = trove.versions:app_factory [pipeline:troveapi] -pipeline = faultwrapper tokenauth authorization contextwrapper ratelimit extensions troveapp +pipeline = faultwrapper authtoken authorization contextwrapper ratelimit extensions troveapp # pipeline = debug troveapp [filter:extensions] paste.filter_factory = trove.common.extensions:factory -[filter:tokenauth] +[filter:authtoken] paste.filter_factory = trove.tests.fakes.keystone:filter_factory service_protocol = http service_host = 127.0.0.1