|
1 This upstream patch addresses an issue with Cinder that can cause |
|
2 oslo-config-generator to fail to recognize valid namespaces. It has |
|
3 been integrated into Newton but not yet backported to Mitaka. |
|
4 |
|
5 commit 91e4fe7d0504cfded97d680832226d8ad7c68b9f |
|
6 Author: Kendall Nelson <[email protected]> |
|
7 Date: Wed Jan 27 09:03:29 2016 -0600 |
|
8 |
|
9 Remove entry_points from setup.cfg |
|
10 |
|
11 The keystonemiddleware entry_point and the oslo_concurrency, |
|
12 oslo_db_concurrency and oslo_messaging entry_points are not |
|
13 owned by Cinder so it is possible that Keystone and Oslo could |
|
14 move or rename the list_opts methods causing our sample |
|
15 configuration generator to break. |
|
16 |
|
17 This patch removes the lines that register the entry_points since |
|
18 they aren't actually adding anything to the sample list of |
|
19 configuration options because the options are being added to the |
|
20 sample file elsewhere. |
|
21 |
|
22 Change-Id: I186d4d9e8e565dad836543b5f6a96af1a53d4a83 |
|
23 |
|
24 --- cinder-8.0.0/setup.cfg.~1~ 2016-07-23 23:54:40.131686330 -0700 |
|
25 +++ cinder-8.0.0/setup.cfg 2016-07-23 23:55:33.014428535 -0700 |
|
26 @@ -43,10 +43,6 @@ cinder.scheduler.weights = |
|
27 VolumeNumberWeigher = cinder.scheduler.weights.volume_number:VolumeNumberWeigher |
|
28 oslo.config.opts = |
|
29 cinder = cinder.opts:list_opts |
|
30 - keystonemiddleware = keystonemiddleware.auth_token:list_opts |
|
31 - oslo_concurrency = oslo_concurrency.opts:list_opts |
|
32 - oslo.messaging = oslo_messaging.opts:list_opts |
|
33 - oslo.db.concurrency = oslo.db.concurrency:list_opts |
|
34 oslo.config.opts.defaults = |
|
35 cinder = cinder.common.config:set_middleware_defaults |
|
36 console_scripts = |