Merge "libvirt: Tolerate existing vm(s) with cdrom(s)" into stable/fo…

…lsom
openstack · May 31, 2013 · 2fcd06c · 2fcd06c
2 parents 20600fc + 8068a1d
commit 2fcd06c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
@@ -2717,6 +2717,12 @@ def get_instance_disk_info(self, instance_name):
                           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))