diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-19 00:42:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-19 00:42:44 +0000 |
| commit | 2369822d344830ebce0febbbe28c65e78f0db676 (patch) | |
| tree | 8fd3d74519fc46f1773e3b33faa67aefd0d5457d | |
| parent | 51e836967ec26300d579de15ca018df2fb6cb78a (diff) | |
| parent | a04aa219cd94f5f4346fb907c083c8f94c21dfa7 (diff) | |
| download | horizon-2369822d344830ebce0febbbe28c65e78f0db676.tar.gz | |
Merge "Tolerate completely missing floating_ips" into stable/icehouse
| -rw-r--r-- | openstack_dashboard/usage/quotas.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py index be2dc9705..0210ff8d7 100644 --- a/openstack_dashboard/usage/quotas.py +++ b/openstack_dashboard/usage/quotas.py @@ -24,6 +24,7 @@ from openstack_dashboard.api import cinder from openstack_dashboard.api import network from openstack_dashboard.api import neutron from openstack_dashboard.api import nova +from openstack_dashboard.exceptions import neutronclient # noqa LOG = logging.getLogger(__name__) @@ -200,7 +201,10 @@ def tenant_quota_usages(request): usages.add_quota(quota) # Get our usages. - floating_ips = network.tenant_floating_ip_list(request) + try: + floating_ips = network.tenant_floating_ip_list(request) + except neutronclient.NeutronClientException: + floating_ips = [] flavors = dict([(f.id, f) for f in nova.flavor_list(request)]) instances, has_more = nova.server_list(request) # Fetch deleted flavors if necessary. |