summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kölker <jason@koelker.net>2012-03-28 11:15:00 -0500
committerJason Kölker <jason@koelker.net>2012-03-28 11:15:00 -0500
commitdc5a29d8bd5f041c3864aed915f8ceb70ce7978a (patch)
treecc2dd8c0a58c4cbda4939f1e4579d18ed756ebd7
parent930be36538e42effc0a3b03c9a3d8a06cb1693ed (diff)
Continue on the the next tenant_id on 400 codes
* Melange connection raises Exception if the response is > 400 * Fixes lp967261 Change-Id: I4592e5907276d290f4a54aa27dd4e91a62cc83e8
-rw-r--r--nova/network/quantum/melange_ipam_lib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py
index c68d83c5b..c48c821d3 100644
--- a/nova/network/quantum/melange_ipam_lib.py
+++ b/nova/network/quantum/melange_ipam_lib.py
@@ -158,7 +158,7 @@ class QuantumMelangeIPAMLib(object):
for tid in tenant_ids:
try:
self.m_conn.get_allocated_ips(net_id, vif_id, tid)
- except KeyError:
+ except Exception:
continue
ipam_tenant_id = tid
break