|
1 This internal patch is cherry picked from commit |
|
2 3bdb51e947e0595d4a0514f3cf29b321cd6f9483 and addresses an issue where |
|
3 the [profiler] options appears in the wrong section. This change will |
|
4 appear in the initial Mitaka release but has not yet been back-ported |
|
5 to Kilo. |
|
6 |
|
7 --- glance-2015.1.2/glance/opts.py.~2~ 2016-01-24 16:51:48.000000000 -0800 |
|
8 +++ glance-2015.1.2/glance/opts.py 2016-01-25 19:10:40.596155047 -0800 |
|
9 @@ -52,7 +52,6 @@ _api_opts = [ |
|
10 glance.common.wsgi.bind_opts, |
|
11 glance.common.wsgi.eventlet_opts, |
|
12 glance.common.wsgi.socket_opts, |
|
13 - glance.common.wsgi.profiler_opts, |
|
14 glance.image_cache.drivers.sqlite.sqlite_opts, |
|
15 glance.image_cache.image_cache_opts, |
|
16 glance.notifier.notifier_opts, |
|
17 @@ -67,6 +66,7 @@ _api_opts = [ |
|
18 glance.async.taskflow_executor.taskflow_executor_opts), |
|
19 ('store_type_location_strategy', |
|
20 glance.common.location_strategy.store_type.store_type_opts), |
|
21 + ('profiler', glance.common.wsgi.profiler_opts), |
|
22 ('paste_deploy', glance.common.config.paste_deploy_opts) |
|
23 ] |
|
24 _registry_opts = [ |
|
25 @@ -76,6 +76,7 @@ _registry_opts = [ |
|
26 glance.common.wsgi.bind_opts, |
|
27 glance.common.wsgi.socket_opts, |
|
28 glance.common.wsgi.eventlet_opts))), |
|
29 + ('profiler', glance.common.wsgi.profiler_opts), |
|
30 ('paste_deploy', glance.common.config.paste_deploy_opts) |
|
31 ] |
|
32 _scrubber_opts = [ |