Comment 11 for bug 1489775

Reviewed: https://review.fuel-infra.org/11319
Submitter: Denis V. Meltsaykin <email address hidden>
Branch: openstack-ci/fuel-6.0-updates/2014.2

Commit: 39826c4227791aa1d0680fc8f40ee6713d886ef4
Author: Sergey Nikitin <email address hidden>
Date: Thu Feb 18 08:25:17 2016

Fixed fail when user tries to delete images in resize state

If InstanceNotFound error is thrown from decorated function,
migration status should be set to 'error', without checking
current migration status.

Conflicts:
        nova/compute/manager.py

Backport patch requires additional method obj_as_admin() in
NovaBase object, so this patch was squashed with
I556d93741f1ee965c960c6099fbf2c57f31c6744

Closes-Bug: #1489775

Change-Id: I95b0ff2be254a2645ab3ddd51b761a8a24c5a751
(cherry picked from commit 500a2372a3921dbb1728fe82c3a6efbb06f373f0)