x/tuskar-ui
Code Issues Proposed changes

Catch another breakage, when cinder is unavailable

Browse Source 
During review of backporting avoid cinder calls, this
has been discovered and should be applied to master branch.

Fixes bug 1098146

Change-Id: I74c7fabd31ed333fc9f44ec92b2c391dd7c9b9ef
This commit is contained in:
Matthias Runge 2013-01-10 12:00:20 +01:00
parent 511cac94fb
commit d0aff3a1a7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/api/cinder.py
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 To see all volumes in the cloud as an admin you can pass in a special
search option: {'all_tenants': 1} 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): def volume_get(request, volume_id):