diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-14 16:29:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-14 16:29:35 +0000 |
| commit | f3dce2c88dae9706f17d6b6a626c71cc851e01b0 (patch) | |
| tree | e01b2ced51c4b7be619b610940d60f01e48c0e10 /nova/api | |
| parent | 658531c139eeccad2806ef2325f1952905d02b04 (diff) | |
| parent | a02b2d77d3bd40954c9c8dda680e2f7ce3e0327e (diff) | |
Merge "Don't log traceback on expected console error."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/consoles.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py index 264f0b270..0431a0694 100644 --- a/nova/api/openstack/compute/contrib/consoles.py +++ b/nova/api/openstack/compute/contrib/consoles.py @@ -49,7 +49,8 @@ class ConsolesController(wsgi.Controller): except exception.InstanceNotFound as e: raise webob.exc.HTTPNotFound(explanation=unicode(e)) except exception.InstanceNotReady as e: - raise webob.exc.HTTPConflict(explanation=unicode(e)) + raise webob.exc.HTTPConflict( + explanation=_('Instance not yet ready')) return {'console': {'type': console_type, 'url': output['url']}} |