diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-02 22:13:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-02 22:13:34 +0000 |
| commit | 8470da6c73f7b28a6ee6bd17c1dc802e9c105dcb (patch) | |
| tree | 5842d7f3d0b1a5f01f0766f2e4a53c566def6b81 /nova/virt | |
| parent | 8f918e7570f0997e9ffa954e0cc70d6537d26c60 (diff) | |
| parent | a1c90a3b3dca567c0075b24901b85a2d41265305 (diff) | |
Merge "Check for image_meta in libvirt.driver.spawn"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index cfed962d0..35ce68fc9 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1028,7 +1028,9 @@ class LibvirtDriver(driver.ComputeDriver): admin_password, network_info=None, block_device_info=None): xml = self.to_xml(instance, network_info, image_meta, block_device_info=block_device_info) - self._create_image(context, instance, xml, network_info=network_info, + if image_meta: + self._create_image(context, instance, xml, + network_info=network_info, block_device_info=block_device_info, files=injected_files, admin_pass=admin_password) |