diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/admin_actions.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index dc3ee8fc4..a3f68e828 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -285,8 +285,12 @@ class AdminActionsController(wsgi.Controller): except exception.ComputeServiceUnavailable as ex: raise exc.HTTPBadRequest(explanation=str(ex)) except Exception: - msg = _("Live migration of instance %(id)s to host %(host)s" - " failed") % locals() + if host is None: + msg = _("Live migration of instance %(id)s to another host" + " failed") % locals() + else: + msg = _("Live migration of instance %(id)s to host %(host)s" + " failed") % locals() LOG.exception(msg) # Return messages from scheduler raise exc.HTTPBadRequest(explanation=msg) |