diff options
| author | Anthony Woods <awoods@internap.com> | 2013-06-16 22:36:18 +0800 |
|---|---|---|
| committer | Anthony Woods <awoods@internap.com> | 2013-06-20 22:12:09 +0800 |
| commit | 8ae97f24b0c806a438456170959ae527ce33ad01 (patch) | |
| tree | 26e1e4330998bb4882796f36481505c491cefb23 /nova/virt | |
| parent | 75ead3a2a37efbc6a4fdea7e492ca41cdd559a8c (diff) | |
| download | nova-8ae97f24b0c806a438456170959ae527ce33ad01.tar.gz nova-8ae97f24b0c806a438456170959ae527ce33ad01.tar.xz nova-8ae97f24b0c806a438456170959ae527ce33ad01.zip | |
fixes nova resize bug when force_config_drive is set.
If files is None, set contents=[] when calling
instance_metadata.InstanceMetadata from within _create_image() to prevent
the method trying to iterate a NoneType.
Fixes bug 1183003
Change-Id: I0ac18ad5363ab9496fa83d231d7ec7c59d737691
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 72ebf0b6e..6aca949f8 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1918,7 +1918,7 @@ class LibvirtDriver(driver.ComputeDriver): extra_md['admin_pass'] = admin_pass inst_md = instance_metadata.InstanceMetadata(instance, - content=files, extra_md=extra_md) + content=files or [], extra_md=extra_md) with configdrive.ConfigDriveBuilder(instance_md=inst_md) as cdb: configdrive_path = basepath(fname='disk.config') LOG.info(_('Creating config drive at %(path)s'), |