diff options
| author | Akihiro MOTOKI <motoki@da.jp.nec.com> | 2012-07-26 17:48:48 +0900 |
|---|---|---|
| committer | Akihiro MOTOKI <motoki@da.jp.nec.com> | 2012-07-27 17:08:21 +0900 |
| commit | ddcc951f08dc24c2fc605b45937a429c2c354e51 (patch) | |
| tree | a88920e219b9c69a45c1dc1c7ed0a5716075cd24 /etc/api-paste.ini | |
| parent | 787f763a33cf59a58930e4b6ee329a43d2dbedd0 (diff) | |
| download | neutron-ddcc951f08dc24c2fc605b45937a429c2c354e51.tar.gz | |
Make quantum pipeline configurable from quantum.conf.
Fixes bug 1029313.
The current api-paste.ini does not provide a way to choose a pipeline:
there is no way to switching a pipeline between keystone-enabled and
noauth pipelines without modifying the pipeline directly.
This commit introduces 'auth_strategy' flag to quantum.conf and
a pipeline used is determined depending on the flag. Supported values for
this flag are 'keystone' (default) and 'noauth' at the moment.
Change-Id: Ieafaf31eaaec2b02727ed5d3bd36c907e50aee5b
Diffstat (limited to 'etc/api-paste.ini')
| -rw-r--r-- | etc/api-paste.ini | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/etc/api-paste.ini b/etc/api-paste.ini index 8c0ccdff34..2a42529e05 100644 --- a/etc/api-paste.ini +++ b/etc/api-paste.ini @@ -5,26 +5,20 @@ use = egg:Paste#urlmap /v1.1: quantumapi_v1_1 /v2.0: quantumapi_v2_0 -[pipeline:quantumapi_v1_0] -# By default, authentication is disabled. -# To enable Keystone integration comment out the -# following line and uncomment the next one -pipeline = extensions quantumapiapp_v1_0 -# pipeline = authtoken keystonecontext extensions quantumapiapp_v1_0 - -[pipeline:quantumapi_v1_1] -# By default, authentication is disabled. -# To enable Keystone integration comment out the -# following line and uncomment the next one -pipeline = extensions quantumapiapp_v1_1 -# pipeline = authtoken keystonecontext extensions quantumapiapp_v1_1 - -[pipeline:quantumapi_v2_0] -# By default, authentication is disabled. -# To enable Keystone integration comment out the -# following line and uncomment the next one -pipeline = extensions quantumapiapp_v2_0 -# pipeline = authtoken keystonecontext extensions quantumapiapp_v2_0 +[composite:quantumapi_v1_0] +use = call:quantum.auth:pipeline_factory +noauth = extensions quantumapiapp_v1_0 +keystone = authtoken keystonecontext extensions quantumapiapp_v1_0 + +[composite:quantumapi_v1_1] +use = call:quantum.auth:pipeline_factory +noauth = extensions quantumapiapp_v1_1 +keystone = authtoken keystonecontext extensions quantumapiapp_v1_1 + +[composite:quantumapi_v2_0] +use = call:quantum.auth:pipeline_factory +noauth = extensions quantumapiapp_v2_0 +keystone = authtoken keystonecontext extensions quantumapiapp_v2_0 [filter:keystonecontext] paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory |