Skip to content

Commit 19721bc

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Corresponds to the Glance patch that splits paste"
2 parents 6577b46 + 8cafc80 commit 19721bc

4 files changed

Lines changed: 73 additions & 75 deletions

File tree

‎files/glance-api-paste.ini‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[pipeline:glance-api]
2+
#pipeline = versionnegotiation context apiv1app
3+
# NOTE: use the following pipeline for keystone
4+
pipeline = versionnegotiation authtoken auth-context apiv1app
5+
6+
# To enable Image Cache Management API replace pipeline with below:
7+
# pipeline = versionnegotiation context imagecache apiv1app
8+
# NOTE: use the following pipeline for keystone auth (with caching)
9+
# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
10+
11+
[app:apiv1app]
12+
paste.app_factory = glance.common.wsgi:app_factory
13+
glance.app_factory = glance.api.v1.router:API
14+
15+
[filter:versionnegotiation]
16+
paste.filter_factory = glance.common.wsgi:filter_factory
17+
glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
18+
19+
[filter:cache]
20+
paste.filter_factory = glance.common.wsgi:filter_factory
21+
glance.filter_factory = glance.api.middleware.cache:CacheFilter
22+
23+
[filter:cachemanage]
24+
paste.filter_factory = glance.common.wsgi:filter_factory
25+
glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter
26+
27+
[filter:context]
28+
paste.filter_factory = glance.common.wsgi:filter_factory
29+
glance.filter_factory = glance.common.context:ContextMiddleware
30+
31+
[filter:authtoken]
32+
paste.filter_factory = keystone.middleware.auth_token:filter_factory
33+
service_host = %KEYSTONE_SERVICE_HOST%
34+
service_port = %KEYSTONE_SERVICE_PORT%
35+
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
36+
auth_host = %KEYSTONE_AUTH_HOST%
37+
auth_port = %KEYSTONE_AUTH_PORT%
38+
auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
39+
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
40+
admin_token = %SERVICE_TOKEN%
41+
42+
[filter:auth-context]
43+
paste.filter_factory = glance.common.wsgi:filter_factory
44+
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

‎files/glance-api.conf‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -137,48 +137,3 @@ scrub_time = 43200
137137
# Directory that the scrubber will use to remind itself of what to delete
138138
# Make sure this is also set in glance-scrubber.conf
139139
scrubber_datadir = /var/lib/glance/scrubber
140-
141-
[pipeline:glance-api]
142-
#pipeline = versionnegotiation context apiv1app
143-
# NOTE: use the following pipeline for keystone
144-
pipeline = versionnegotiation authtoken auth-context apiv1app
145-
146-
# To enable Image Cache Management API replace pipeline with below:
147-
# pipeline = versionnegotiation context imagecache apiv1app
148-
# NOTE: use the following pipeline for keystone auth (with caching)
149-
# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
150-
151-
[app:apiv1app]
152-
paste.app_factory = glance.common.wsgi:app_factory
153-
glance.app_factory = glance.api.v1.router:API
154-
155-
[filter:versionnegotiation]
156-
paste.filter_factory = glance.common.wsgi:filter_factory
157-
glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
158-
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
166-
167-
[filter:context]
168-
paste.filter_factory = glance.common.wsgi:filter_factory
169-
glance.filter_factory = glance.common.context:ContextMiddleware
170-
171-
[filter:authtoken]
172-
paste.filter_factory = keystone.middleware.auth_token:filter_factory
173-
service_protocol = http
174-
service_host = 127.0.0.1
175-
service_port = 5000
176-
auth_host = 127.0.0.1
177-
auth_port = 35357
178-
auth_protocol = http
179-
auth_uri = http://127.0.0.1:5000/
180-
admin_token = %SERVICE_TOKEN%
181-
182-
[filter:auth-context]
183-
paste.filter_factory = glance.common.wsgi:filter_factory
184-
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

‎files/glance-registry-paste.ini‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[pipeline:glance-registry]
2+
#pipeline = context registryapp
3+
# NOTE: use the following pipeline for keystone
4+
pipeline = authtoken auth-context context registryapp
5+
6+
[app:registryapp]
7+
paste.app_factory = glance.common.wsgi:app_factory
8+
glance.app_factory = glance.registry.api.v1:API
9+
10+
[filter:context]
11+
context_class = glance.registry.context.RequestContext
12+
paste.filter_factory = glance.common.wsgi:filter_factory
13+
glance.filter_factory = glance.common.context:ContextMiddleware
14+
15+
[filter:authtoken]
16+
paste.filter_factory = keystone.middleware.auth_token:filter_factory
17+
service_host = %KEYSTONE_SERVICE_HOST%
18+
service_port = %KEYSTONE_SERVICE_PORT%
19+
service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
20+
auth_host = %KEYSTONE_AUTH_HOST%
21+
auth_port = %KEYSTONE_AUTH_PORT%
22+
auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
23+
auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
24+
admin_token = %SERVICE_TOKEN%
25+
26+
[filter:auth-context]
27+
context_class = glance.registry.context.RequestContext
28+
paste.filter_factory = glance.common.wsgi:filter_factory
29+
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

‎files/glance-registry.conf‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,33 +42,3 @@ api_limit_max = 1000
4242
# If a `limit` query param is not provided in an api request, it will
4343
# default to `limit_param_default`
4444
limit_param_default = 25
45-
46-
[pipeline:glance-registry]
47-
#pipeline = context registryapp
48-
# NOTE: use the following pipeline for keystone
49-
pipeline = authtoken auth-context context registryapp
50-
51-
[app:registryapp]
52-
paste.app_factory = glance.common.wsgi:app_factory
53-
glance.app_factory = glance.registry.api.v1:API
54-
55-
[filter:context]
56-
context_class = glance.registry.context.RequestContext
57-
paste.filter_factory = glance.common.wsgi:filter_factory
58-
glance.filter_factory = glance.common.context:ContextMiddleware
59-
60-
[filter:authtoken]
61-
paste.filter_factory = keystone.middleware.auth_token:filter_factory
62-
service_protocol = http
63-
service_host = 127.0.0.1
64-
service_port = 5000
65-
auth_host = 127.0.0.1
66-
auth_port = 35357
67-
auth_protocol = http
68-
auth_uri = http://127.0.0.1:5000/
69-
admin_token = %SERVICE_TOKEN%
70-
71-
[filter:auth-context]
72-
context_class = glance.registry.context.RequestContext
73-
paste.filter_factory = glance.common.wsgi:filter_factory
74-
glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware

0 commit comments

Comments
 (0)