1. devstack
  2. Commit 8cafc80551a0c471e0b1ed55fff258daad3302e2
Browse code

Corresponds to the Glance patch that splits paste

The patchset https://review.openstack.org/#change,3036 splits
paste.deploy application pipeline stuff from regular configuration
file options. This is the change to devstack that will be needed
to go along with that change in Glance.

Change-Id: I606aa81c8ebdf50cdc554611ab3781c554991205

Jay Pipes authored on 2012/01/17 12:01:06
Showing 4 changed files
files/glance-api-paste.ini
History View file @ 8cafc80
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,44 @@
0 
+[pipeline:glance-api]
1 
+#pipeline = versionnegotiation context apiv1app
2 
+# NOTE: use the following pipeline for keystone
3 
+pipeline = versionnegotiation authtoken auth-context apiv1app
4 
+
5 
+# To enable Image Cache Management API replace pipeline with below:
6 
+# pipeline = versionnegotiation context imagecache apiv1app
7 
+# NOTE: use the following pipeline for keystone auth (with caching)
8 
+# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app
9 
+
10 
+[app:apiv1app]
11 
+paste.app_factory = glance.common.wsgi:app_factory
12 
+glance.app_factory = glance.api.v1.router:API
13 
+
14 
+[filter:versionnegotiation]
15 
+paste.filter_factory = glance.common.wsgi:filter_factory
16 
+glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter
17 
+
18 
+[filter:cache]
19 
+paste.filter_factory = glance.common.wsgi:filter_factory
20 
+glance.filter_factory = glance.api.middleware.cache:CacheFilter
21 
+
22 
+[filter:cachemanage]
23 
+paste.filter_factory = glance.common.wsgi:filter_factory
24 
+glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter
25 
+
26 
+[filter:context]
27 
+paste.filter_factory = glance.common.wsgi:filter_factory
28 
+glance.filter_factory = glance.common.context:ContextMiddleware
29 
+
30 
+[filter:authtoken]
31 
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
32 
+service_host = %KEYSTONE_SERVICE_HOST%
33 
+service_port = %KEYSTONE_SERVICE_PORT%
34 
+service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
35 
+auth_host = %KEYSTONE_AUTH_HOST%
36 
+auth_port = %KEYSTONE_AUTH_PORT%
37 
+auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
38 
+auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
39 
+admin_token = %SERVICE_TOKEN%
40 
+
41 
+[filter:auth-context]
42 
+paste.filter_factory = glance.common.wsgi:filter_factory
43 
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
files/glance-api.conf
History View file @ 8cafc80
... ... 
@@ -137,48 +137,3 @@ scrub_time = 43200
137 137 
 # Directory that the scrubber will use to remind itself of what to delete
138 138 
 # Make sure this is also set in glance-scrubber.conf
139 139 
 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
History View file @ 8cafc80
185 140 
new file mode 100644
... ... 
@@ -0,0 +1,29 @@
0 
+[pipeline:glance-registry]
1 
+#pipeline = context registryapp
2 
+# NOTE: use the following pipeline for keystone
3 
+pipeline = authtoken auth-context context registryapp
4 
+
5 
+[app:registryapp]
6 
+paste.app_factory = glance.common.wsgi:app_factory
7 
+glance.app_factory = glance.registry.api.v1:API
8 
+
9 
+[filter:context]
10 
+context_class = glance.registry.context.RequestContext
11 
+paste.filter_factory = glance.common.wsgi:filter_factory
12 
+glance.filter_factory = glance.common.context:ContextMiddleware
13 
+
14 
+[filter:authtoken]
15 
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
16 
+service_host = %KEYSTONE_SERVICE_HOST%
17 
+service_port = %KEYSTONE_SERVICE_PORT%
18 
+service_protocol = %KEYSTONE_SERVICE_PROTOCOL%
19 
+auth_host = %KEYSTONE_AUTH_HOST%
20 
+auth_port = %KEYSTONE_AUTH_PORT%
21 
+auth_protocol = %KEYSTONE_AUTH_PROTOCOL%
22 
+auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/
23 
+admin_token = %SERVICE_TOKEN%
24 
+
25 
+[filter:auth-context]
26 
+context_class = glance.registry.context.RequestContext
27 
+paste.filter_factory = glance.common.wsgi:filter_factory
28 
+glance.filter_factory = keystone.middleware.glance_auth_token:KeystoneContextMiddleware
files/glance-registry.conf
History View file @ 8cafc80
... ... 
@@ -42,33 +42,3 @@ api_limit_max = 1000
42 42 
 # If a `limit` query param is not provided in an api request, it will
43 43 
 # default to `limit_param_default`
44 44 
 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