| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:42 -0700 | |
| changeset 6854 | 52081f923019 |
| child 6879 | e4644601dca8 |
| permissions | -rw-r--r-- |
|
6854
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to adjust nova/virt/opts.py to omit the Hyper-V |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
2 |
hypervisor driver as it has unresolved dependencies and to add the |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
3 |
Solaris Zones hypervisor driver, as well as some missing common |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
4 |
components. |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
5 |
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
6 |
--- nova-13.1.0/etc/nova/nova-config-generator.conf.~1~ 2016-06-14 08:45:49.000000000 -0700 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
7 |
+++ nova-13.1.0/etc/nova/nova-config-generator.conf 2016-07-25 23:42:03.124618180 -0700 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
8 |
@@ -21,3 +21,10 @@ namespace = oslo.db |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
9 |
namespace = oslo.middleware |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
10 |
namespace = oslo.concurrency |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
11 |
namespace = keystonemiddleware.auth_token |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
12 |
+namespace = castellan.config |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
13 |
+namespace = oslo.db.concurrency |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
14 |
+namespace = oslo.middleware.cors |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
15 |
+namespace = oslo.middleware.sizelimit |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
16 |
+namespace = oslo.middleware.ssl |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
17 |
+namespace = oslo.reports |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
18 |
+namespace = oslo.versionedobjects |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
19 |
--- nova-13.1.0/nova/virt/opts.py.~1~ 2016-06-14 08:45:49.000000000 -0700 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
20 |
+++ nova-13.1.0/nova/virt/opts.py 2016-07-25 23:40:46.653786235 -0700 |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
21 |
@@ -15,11 +15,6 @@ import itertools |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
22 |
import nova.conf |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
23 |
import nova.virt.configdrive |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
24 |
import nova.virt.disk.vfs.guestfs |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
25 |
-import nova.virt.hyperv.eventhandler |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
26 |
-import nova.virt.hyperv.pathutils |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
27 |
-import nova.virt.hyperv.vif |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
28 |
-import nova.virt.hyperv.vmops |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
29 |
-import nova.virt.hyperv.volumeops |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
30 |
import nova.virt.imagecache |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
31 |
import nova.virt.libvirt.driver |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
32 |
import nova.virt.libvirt.imagebackend |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
33 |
@@ -38,6 +33,7 @@ import nova.virt.libvirt.volume.remotefs |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
34 |
import nova.virt.libvirt.volume.scality |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
35 |
import nova.virt.libvirt.volume.smbfs |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
36 |
import nova.virt.libvirt.volume.volume |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
37 |
+import nova.virt.solariszones.driver |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
38 |
import nova.virt.vmwareapi.driver |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
39 |
import nova.virt.vmwareapi.images |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
40 |
import nova.virt.vmwareapi.vif |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
41 |
@@ -63,14 +59,6 @@ def list_opts(): |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
42 |
nova.virt.imagecache.imagecache_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
43 |
)), |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
44 |
('guestfs', nova.virt.disk.vfs.guestfs.guestfs_opts),
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
45 |
- ('hyperv',
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
46 |
- itertools.chain( |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
47 |
- nova.virt.hyperv.pathutils.hyperv_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
48 |
- nova.virt.hyperv.vif.hyperv_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
49 |
- nova.virt.hyperv.vmops.hyperv_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
50 |
- nova.virt.hyperv.volumeops.hyper_volumeops_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
51 |
- nova.virt.hyperv.eventhandler.hyperv_opts |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
52 |
- )), |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
53 |
('libvirt',
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
54 |
itertools.chain( |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
55 |
nova.virt.libvirt.driver.libvirt_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
56 |
@@ -91,6 +79,7 @@ def list_opts(): |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
57 |
nova.virt.libvirt.volume.scality.volume_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
58 |
nova.virt.libvirt.volume.smbfs.volume_opts, |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
59 |
)), |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
60 |
+ ('solariszones', nova.virt.solariszones.driver.solariszones_opts),
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
61 |
('vmware',
|
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
62 |
itertools.chain( |
|
52081f923019
24465850 Update Nova for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
63 |
[nova.virt.vmwareapi.vim_util.vmware_opts], |