Merge "Catch an exception in power off procedure"

Author: Zuul

nova/virt/libvirt/driver.py

@@ -4016,7 +4016,12 @@ def _clean_shutdown(self, instance, timeout, retry_interval):
 
         LOG.debug("Shutting down instance from state %s", state,
                   instance=instance)
-        guest.shutdown()
+        try:
+            guest.shutdown()
+        except libvirt.libvirtError as e:
+            LOG.debug("Ignoring libvirt exception from shutdown request: %s",
+                      encodeutils.exception_to_unicode(e),
+                      instance=instance)
         retry_countdown = retry_interval
 
         for sec in range(timeout):