diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-25 01:33:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-25 01:33:07 +0000 |
| commit | acb2dc5e27a85b9148599f1c4dd59e317752f125 (patch) | |
| tree | 79c5c89ff5ed4a4a1e854c27cbe78d1af0c53bbc | |
| parent | ae2cd311344aae4c230f7e6465c0f2cfe8be3082 (diff) | |
| parent | 2a6c77ed6aac70c225e3e93dca1bd6197c3dbc28 (diff) | |
| download | nova-acb2dc5e27a85b9148599f1c4dd59e317752f125.tar.gz | |
Merge "Add ppcle architectures to libvirt blockinfo" into stable/liberty
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_blockinfo.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_blockinfo.py b/nova/tests/unit/virt/libvirt/test_blockinfo.py index 54540d3312..d1c0a7cdfa 100644 --- a/nova/tests/unit/virt/libvirt/test_blockinfo.py +++ b/nova/tests/unit/virt/libvirt/test_blockinfo.py @@ -678,6 +678,10 @@ class LibvirtBlockInfoTest(test.NoDBTestCase): (arch.PPC, 'cdrom', 'scsi'), (arch.PPC64, 'disk', 'virtio'), (arch.PPC64, 'cdrom', 'scsi'), + (arch.PPCLE, 'disk', 'virtio'), + (arch.PPCLE, 'cdrom', 'scsi'), + (arch.PPC64LE, 'disk', 'virtio'), + (arch.PPC64LE, 'cdrom', 'scsi'), (arch.S390, 'disk', 'virtio'), (arch.S390, 'cdrom', 'scsi'), (arch.S390X, 'disk', 'virtio'), diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index f0012e6d8a..f320d1f4a3 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -257,7 +257,8 @@ def get_disk_bus_for_device_type(instance, elif virt_type in ("qemu", "kvm"): if device_type == "cdrom": guestarch = libvirt_utils.get_arch(image_meta) - if guestarch in (arch.PPC, arch.PPC64, arch.S390, arch.S390X): + if guestarch in (arch.PPC, arch.PPC64, arch.PPCLE, arch.PPC64LE, + arch.S390, arch.S390X): return "scsi" else: return "ide" |