Merge "Fix bug #917615"

nova/compute/manager.py

@@ -1985,7 +1985,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         block_device_info = \
             self._get_instance_volume_block_device_info(context, instance_id)
         self.driver.destroy(instance_ref, network_info,
-                            block_device_info, True)
+                            block_device_info)
 
     @manager.periodic_task
     def _poll_rebooting_instances(self, context):

nova/virt/libvirt/connection.py

@@ -1714,8 +1714,8 @@ class LibvirtConnection(driver.ComputeDriver):
                              FLAGS.live_migration_bandwidth)
 
         except Exception:
+            with utils.save_and_reraise_exception():
                 recover_method(ctxt, instance_ref, dest, block_migration)
-            raise
 
         # Waiting for completion of live_migration.
         timer = utils.LoopingCall(f=None)