diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-20 16:12:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-20 16:12:11 +0000 |
| commit | beb15b5e76312d9100b84d5a80af7ce2e1f57c9b (patch) | |
| tree | 2e8014bdf54ecfa5ff8c4aec89a94f2d5f0544be | |
| parent | 740d39e8e5dc097a66a1e9a8c278918da4997b03 (diff) | |
| parent | 4d3a50a48011b412bf66b1386292f85cccf1db74 (diff) | |
Merge "Revert "Attach ISO as separate disk if given proper instruction""
| -rw-r--r-- | nova/virt/libvirt/driver.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 56e8a155a..325569f8a 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1688,15 +1688,6 @@ class LibvirtDriver(driver.ComputeDriver): diskos.target_dev = root_device if root_device_type == "cdrom": diskos.target_bus = "ide" - # NOTE(jk0): Only attach the ISO as a separate drive if - # the appropriate metadata is set on the image. - image_properties = image_meta.get("properties", {}) - if "separate_attach" in image_properties: - separate_disk = disk_info("disk") - separate_disk.driver_cache = self.disk_cachemode - separate_disk.target_dev = self.default_root_device - separate_disk.target_bus = ephemeral_disk_bus - guest.add_device(separate_disk) else: diskos.target_bus = "virtio" guest.add_device(diskos) |