x
/
trio2o
Code Issues Proposed changes

add keystoneclient/cinderclient token unauthorized exception caught 

when cinderClient being generated, b/c this will be helpful to break
out from recursion when cinderclient being constructed from invalid
user/password

Change-Id: Id179b03b5d60af0af8cccfb64a7fad1ca709bf83
This commit is contained in:
ChiZhang 2015-01-13 16:29:00 +08:00
parent f295bfbc32
commit 22f28d5908
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinderproxy/cinder/volume/cinder_proxy.py
View File

@ -58,9 +58,9 @@ from cinder.volume.configuration import Configuration
from cinder.volume import utils as volume_utils
from cinderclient.v2 import client as cinder_client
from cinderclient import exceptions as cinder_exception
from keystoneclient import exceptions as keystone_exception
from eventlet.greenpool import GreenPool
from keystoneclient import exceptions as keystone_exception
from keystoneclient.v2_0 import client as kc
LOG = logging.getLogger(__name__)
@ -281,11 +281,11 @@ class CinderProxy(manager.SchedulerDependentManager):
return cinderclient
except keystone_exception.Unauthorized:
with excutils.save_and_reraise_exception():
LOG.error(_('Token unauthorized failed for keystoneclient'
' constructed when get cascaded admin client'))
LOG.error(_('Token unauthorized failed for keystoneclient '
'constructed when get cascaded admin client'))
except cinder_exception.Unauthorized:
with excutils.save_and_reraise_exception():
LOG.error(_('Token unauthorized failed for cascaded'
LOG.error(_('Token unauthorized failed for cascaded '
'cinderClient constructed'))
except Exception:
with excutils.save_and_reraise_exception():