diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-22 13:02:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-22 13:02:27 +0000 |
| commit | a42845e455c74f41852babbbd09a3514021ea71d (patch) | |
| tree | 7ff0579873340d27921dd88d317d705b67aab21d /nova/virt | |
| parent | 3aaec13bdba1514cb8971de5fc3ea7c7ba2e5397 (diff) | |
| parent | 78126baa70f9f05ae9fd9f7423da4ea0ba45c49c (diff) | |
Merge "Fix launching libvirt instances with swap"
Diffstat (limited to 'nova/virt')
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/netutils.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index bcbd1de87..dfae88c23 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1780,6 +1780,7 @@ class LibvirtDriver(driver.ComputeDriver): ephemeral_size=eph['size']) if 'disk.swap' in disk_mapping: + mapping = disk_mapping['disk.swap'] swap_mb = 0 swap = driver.block_device_info_get_swap(block_device_info) @@ -1787,7 +1788,7 @@ class LibvirtDriver(driver.ComputeDriver): swap_mb = swap['swap_size'] elif (inst_type['swap'] > 0 and not block_device.volume_in_mapping( - swap['dev'], block_device_info)): + mapping['dev'], block_device_info)): swap_mb = inst_type['swap'] if swap_mb > 0: diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index eec2d6467..1277251b5 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -67,6 +67,9 @@ def get_injected_network_template(network_info, use_ipv6=CONF.use_ipv6, convert the type itself if necessary. """ + if network_info is None: + return None + # the code below depends on the legacy 'network_info' if hasattr(network_info, 'legacy'): network_info = network_info.legacy() |