author | Laszlo Peter <laszlo.peter@oracle.com> |
Wed, 07 Sep 2016 14:48:41 -0700 | |
changeset 6849 | f9a2279efa0d |
permissions | -rw-r--r-- |
6849
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to adjust cinder/opts.py to omit drivers that have |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
2 |
unresolved dependencies and to add the Solaris NFS and ZFS drivers, as |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
3 |
well as some missing common components. This patch is not suitable for |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
4 |
pushing upstream. |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
5 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
6 |
--- cinder-8.0.0/cinder/config/cinder-config-generator.conf.~1~ 2016-04-07 00:30:48.000000000 -0700 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
7 |
+++ cinder-8.0.0/cinder/config/cinder-config-generator.conf 2016-07-25 17:19:20.950619120 -0700 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
8 |
@@ -22,3 +22,4 @@ namespace = oslo.service.wsgi |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
9 |
namespace = oslo.utils |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
10 |
namespace = oslo.versionedobjects |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
11 |
namespace = oslo.vmware |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
12 |
+namespace = oslo.db.concurrency |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
13 |
--- cinder-8.0.0/cinder/opts.py.~1~ 2016-04-07 00:30:48.000000000 -0700 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
14 |
+++ cinder-8.0.0/cinder/opts.py 2016-07-25 15:02:28.185268715 -0700 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
15 |
@@ -23,7 +23,6 @@ from cinder.backup import chunkeddriver |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
16 |
from cinder.backup import driver as cinder_backup_driver |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
17 |
from cinder.backup.drivers import ceph as cinder_backup_drivers_ceph |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
18 |
from cinder.backup.drivers import glusterfs as cinder_backup_drivers_glusterfs |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
19 |
-from cinder.backup.drivers import google as cinder_backup_drivers_google |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
20 |
from cinder.backup.drivers import nfs as cinder_backup_drivers_nfs |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
21 |
from cinder.backup.drivers import posix as cinder_backup_drivers_posix |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
22 |
from cinder.backup.drivers import swift as cinder_backup_drivers_swift |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
23 |
@@ -31,6 +30,7 @@ from cinder.backup.drivers import tsm as |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
24 |
from cinder.backup import manager as cinder_backup_manager |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
25 |
from cinder.cmd import all as cinder_cmd_all |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
26 |
from cinder.cmd import volume as cinder_cmd_volume |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
27 |
+from cinder.cmd import volume_usage_audit as cinder_cmd_volumeusageaudit |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
28 |
from cinder.common import config as cinder_common_config |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
29 |
import cinder.compute |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
30 |
from cinder.compute import nova as cinder_compute_nova |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
31 |
@@ -146,6 +146,10 @@ from cinder.volume.drivers.san import sa |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
32 |
from cinder.volume.drivers import scality as cinder_volume_drivers_scality |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
33 |
from cinder.volume.drivers import sheepdog as cinder_volume_drivers_sheepdog |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
34 |
from cinder.volume.drivers import smbfs as cinder_volume_drivers_smbfs |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
35 |
+from cinder.volume.drivers.solaris import nfs as \ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
36 |
+ cinder_volume_drivers_solaris_nfs |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
37 |
+from cinder.volume.drivers.solaris import zfs as \ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
38 |
+ cinder_volume_drivers_solaris_zfs |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
39 |
from cinder.volume.drivers import solidfire as cinder_volume_drivers_solidfire |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
40 |
from cinder.volume.drivers import tegile as cinder_volume_drivers_tegile |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
41 |
from cinder.volume.drivers import tintri as cinder_volume_drivers_tintri |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
42 |
@@ -154,8 +158,6 @@ from cinder.volume.drivers.violin import |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
43 |
from cinder.volume.drivers.vmware import vmdk as \ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
44 |
cinder_volume_drivers_vmware_vmdk |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
45 |
from cinder.volume.drivers import vzstorage as cinder_volume_drivers_vzstorage |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
46 |
-from cinder.volume.drivers.windows import windows as \ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
47 |
- cinder_volume_drivers_windows_windows |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
48 |
from cinder.volume.drivers import xio as cinder_volume_drivers_xio |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
49 |
from cinder.volume.drivers.zfssa import zfssaiscsi as \ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
50 |
cinder_volume_drivers_zfssa_zfssaiscsi |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
51 |
@@ -199,6 +201,7 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
52 |
cinder_volume_drivers_san_san.san_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
53 |
cinder_volume_drivers_hitachi_hnasnfs.NFS_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
54 |
cinder_wsgi_eventletserver.socket_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
55 |
+ cinder_volume_drivers_solaris_nfs.solaris_zfs_nfs_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
56 |
cinder_sshutils.ssh_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
57 |
cinder_volume_drivers_netapp_options.netapp_proxy_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
58 |
cinder_volume_drivers_netapp_options.netapp_connection_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
59 |
@@ -218,6 +221,7 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
60 |
cinder_volume_drivers_fujitsu_eternusdxcommon. |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
61 |
FJ_ETERNUS_DX_OPT_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
62 |
cinder_volume_drivers_ibm_gpfs.gpfs_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
63 |
+ cinder_volume_drivers_solaris_zfs.solaris_zfs_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
64 |
cinder_volume_drivers_violin_v7000common.violin_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
65 |
cinder_volume_drivers_nexenta_options.NEXENTA_CONNECTION_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
66 |
cinder_volume_drivers_nexenta_options.NEXENTA_ISCSI_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
67 |
@@ -226,6 +230,8 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
68 |
cinder_volume_drivers_nexenta_options.NEXENTA_RRMGR_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
69 |
cinder_volume_drivers_nexenta_options.NEXENTA_EDGE_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
70 |
cinder_exception.exc_log_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
71 |
+ cinder_common_config.core_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
72 |
+ cinder_common_config.debug_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
73 |
cinder_common_config.global_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
74 |
cinder_scheduler_weights_capacity.capacity_weight_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
75 |
cinder_volume_drivers_sheepdog.sheepdog_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
76 |
@@ -271,7 +277,6 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
77 |
cinder_volume_driver.iser_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
78 |
cinder_api_views_versions.versions_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
79 |
cinder_volume_drivers_nimble.nimble_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
80 |
- cinder_volume_drivers_windows_windows.windows_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
81 |
cinder_volume_drivers_san_hp_hpmsacommon.common_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
82 |
cinder_volume_drivers_san_hp_hpmsacommon.iscsi_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
83 |
cinder_image_glance.glance_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
84 |
@@ -282,7 +287,6 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
85 |
cinder_volume_drivers_remotefs.nas_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
86 |
cinder_volume_drivers_remotefs.volume_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
87 |
cinder_volume_drivers_emc_xtremio.XTREMIO_OPTS, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
88 |
- cinder_backup_drivers_google.gcsbackup_service_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
89 |
[cinder_api_middleware_auth.use_forwarded_for_opt], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
90 |
cinder_volume_drivers_hitachi_hbsdcommon.volume_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
91 |
cinder_volume_drivers_infortrend_eonstor_ds_cli_commoncli. |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
92 |
@@ -335,6 +339,7 @@ def list_opts(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
93 |
cinder_volume_drivers_quobyte.volume_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
94 |
cinder_volume_drivers_vzstorage.vzstorage_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
95 |
cinder_volume_drivers_nfs.nfs_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
96 |
+ cinder_cmd_volumeusageaudit.script_opts, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
97 |
)), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
98 |
('CISCO_FABRIC_EXAMPLE', |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
99 |
itertools.chain( |