Merge "libvirt: Tolerate existing vm(s) with cdrom(s)"

1 files changed, 6 insertions, 0 deletions

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index eabe75c73..c5692929c 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -3327,6 +3327,12 @@ class LibvirtDriver(driver.ComputeDriver):
                           locals())
                 continue
 
+            if not path:
+                LOG.debug(_('skipping disk for %(instance_name)s as it'
+                            ' does not have a path') %
+                          locals())
+                continue
+
             # get the real disk size or
             # raise a localized error if image is unavailable
             dk_size = int(os.path.getsize(path))