From 42585a3b2559329f0e563bcd04ff6c8c19115439 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Mon, 26 Mar 2012 14:50:17 -0700 Subject: Handle Forbidden and NotAuthenticated glance exc. * Remove references to deprecated NotAuthorized exception * Handle Forbidden and NotAuthenticated * Fixes bug 965540 Change-Id: Ib5eef3015239e0fafdb01c975a0f5d553f70519e --- nova/image/glance.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nova/image') diff --git a/nova/image/glance.py b/nova/image/glance.py index 93e6cf273..a5f9e6865 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -485,7 +485,8 @@ def _reraise_translated_exception(): def _translate_image_exception(image_id, exc_type, exc_value): - if exc_type in (glance_exception.NotAuthorized, + if exc_type in (glance_exception.Forbidden, + glance_exception.NotAuthenticated, glance_exception.MissingCredentialError): return exception.ImageNotAuthorized(image_id=image_id) if exc_type is glance_exception.NotFound: @@ -496,7 +497,8 @@ def _translate_image_exception(image_id, exc_type, exc_value): def _translate_plain_exception(exc_type, exc_value): - if exc_type in (glance_exception.NotAuthorized, + if exc_type in (glance_exception.Forbidden, + glance_exception.NotAuthenticated, glance_exception.MissingCredentialError): return exception.NotAuthorized(exc_value) if exc_type is glance_exception.NotFound: -- cgit