Merge "Catch another breakage, when cinder is unavailable"

This commit is contained in:
Jenkins 2013-01-21 01:15:25 +00:00 committed by Gerrit Code Review
commit 85f3ffd927

View File

@ -65,7 +65,10 @@ def volume_list(request, search_opts=None):
To see all volumes in the cloud as an admin you can pass in a special
search option: {'all_tenants': 1}
"""
return cinderclient(request).volumes.list(search_opts=search_opts)
c_client = cinderclient(request)
if c_client is None:
return []
return c_client.volumes.list(search_opts=search_opts)
def volume_get(request, volume_id):