diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-24 19:18:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-24 19:18:32 +0000 |
| commit | d4c7e88c86eabdd48558717e20966d7b4d092eec (patch) | |
| tree | 3b8dca581ff3d9c6b69f64483a1d2d46b2c7d00d /nova/virt | |
| parent | 1612df9a260922d7361ea8640917339d10c9c9dd (diff) | |
| parent | 2cb31123302a1ec8c8dec0cb2ac288a2e3b19c68 (diff) | |
Merge "XenApi virt driver should throw exception on failure"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 80a4fb48a..d18fc2729 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -1253,7 +1253,11 @@ class VMOps(object): instance=instance) return - vm_utils.hard_shutdown_vm(self._session, instance, vm_ref) + shutdown_success = vm_utils.hard_shutdown_vm(self._session, instance, + vm_ref) + if not shutdown_success: + raise exception.InstancePowerOffFailure( + _("XenAPI failed to power the instance off")) if destroy_disks: self._volumeops.detach_all(vm_ref) |