Browse code
Update glance config files for https://review.openstack.org/#change,2139
Change-Id: I61d10508282ebbc1a1910f1723b25f360068f366
Dean Troyer authored on 2011/12/15 06:52:02Showing 2 changed files
| ... | ... |
@@ -141,30 +141,32 @@ scrubber_datadir = /var/lib/glance/scrubber |
| 141 | 141 |
[pipeline:glance-api] |
| 142 | 142 |
#pipeline = versionnegotiation context apiv1app |
| 143 | 143 |
# NOTE: use the following pipeline for keystone |
| 144 |
-pipeline = versionnegotiation authtoken context apiv1app |
|
| 144 |
+pipeline = versionnegotiation authtoken auth-context apiv1app |
|
| 145 | 145 |
|
| 146 | 146 |
# To enable Image Cache Management API replace pipeline with below: |
| 147 | 147 |
# pipeline = versionnegotiation context imagecache apiv1app |
| 148 | 148 |
# NOTE: use the following pipeline for keystone auth (with caching) |
| 149 |
-# pipeline = versionnegotiation authtoken context imagecache apiv1app |
|
| 150 |
- |
|
| 151 |
-[pipeline:versions] |
|
| 152 |
-pipeline = versionsapp |
|
| 153 |
- |
|
| 154 |
-[app:versionsapp] |
|
| 155 |
-paste.app_factory = glance.api.versions:app_factory |
|
| 149 |
+# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app |
|
| 156 | 150 |
|
| 157 | 151 |
[app:apiv1app] |
| 158 |
-paste.app_factory = glance.api.v1.router:app_factory |
|
| 152 |
+paste.app_factory = glance.common.wsgi:app_factory |
|
| 153 |
+glance.app_factory = glance.api.v1.router:API |
|
| 159 | 154 |
|
| 160 | 155 |
[filter:versionnegotiation] |
| 161 |
-paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory |
|
| 156 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 157 |
+glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter |
|
| 162 | 158 |
|
| 163 |
-[filter:imagecache] |
|
| 164 |
-paste.filter_factory = glance.api.middleware.image_cache:filter_factory |
|
| 159 |
+[filter:cache] |
|
| 160 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 161 |
+glance.filter_factory = glance.api.middleware.cache:CacheFilter |
|
| 162 |
+ |
|
| 163 |
+[filter:cachemanage] |
|
| 164 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 165 |
+glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter |
|
| 165 | 166 |
|
| 166 | 167 |
[filter:context] |
| 167 |
-paste.filter_factory = glance.common.context:filter_factory |
|
| 168 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 169 |
+glance.filter_factory = glance.common.context:ContextMiddleware |
|
| 168 | 170 |
|
| 169 | 171 |
[filter:authtoken] |
| 170 | 172 |
paste.filter_factory = keystone.middleware.auth_token:filter_factory |
| ... | ... |
@@ -176,3 +178,7 @@ auth_port = 35357 |
| 176 | 176 |
auth_protocol = http |
| 177 | 177 |
auth_uri = http://127.0.0.1:5000/ |
| 178 | 178 |
admin_token = %SERVICE_TOKEN% |
| 179 |
+ |
|
| 180 |
+[filter:auth-context] |
|
| 181 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 182 |
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware |
| ... | ... |
@@ -46,14 +46,16 @@ limit_param_default = 25 |
| 46 | 46 |
[pipeline:glance-registry] |
| 47 | 47 |
#pipeline = context registryapp |
| 48 | 48 |
# NOTE: use the following pipeline for keystone |
| 49 |
-pipeline = authtoken keystone_shim context registryapp |
|
| 49 |
+pipeline = authtoken auth-context context registryapp |
|
| 50 | 50 |
|
| 51 | 51 |
[app:registryapp] |
| 52 |
-paste.app_factory = glance.registry.server:app_factory |
|
| 52 |
+paste.app_factory = glance.common.wsgi:app_factory |
|
| 53 |
+glance.app_factory = glance.registry.api.v1:API |
|
| 53 | 54 |
|
| 54 | 55 |
[filter:context] |
| 55 | 56 |
context_class = glance.registry.context.RequestContext |
| 56 |
-paste.filter_factory = glance.common.context:filter_factory |
|
| 57 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 58 |
+glance.filter_factory = glance.common.context:ContextMiddleware |
|
| 57 | 59 |
|
| 58 | 60 |
[filter:authtoken] |
| 59 | 61 |
paste.filter_factory = keystone.middleware.auth_token:filter_factory |
| ... | ... |
@@ -66,5 +68,7 @@ auth_protocol = http |
| 66 | 66 |
auth_uri = http://127.0.0.1:5000/ |
| 67 | 67 |
admin_token = %SERVICE_TOKEN% |
| 68 | 68 |
|
| 69 |
-[filter:keystone_shim] |
|
| 70 |
-paste.filter_factory = keystone.middleware.glance_auth_token:filter_factory |
|
| 69 |
+[filter:auth-context] |
|
| 70 |
+context_class = glance.registry.context.RequestContext |
|
| 71 |
+paste.filter_factory = glance.common.wsgi:filter_factory |
|
| 72 |
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware |