diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-29 19:06:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-29 19:06:24 +0000 |
| commit | 8079d82e6c0d419017fdea079fe02fe7cde002d8 (patch) | |
| tree | cab2e64a23d2ac4eb2d2f22011bf78e0c999c9f0 | |
| parent | b5e92a337b783d787cb551877f8a6f8cbc0a5a6e (diff) | |
| parent | dc5a29d8bd5f041c3864aed915f8ceb70ce7978a (diff) | |
| download | nova-8079d82e6c0d419017fdea079fe02fe7cde002d8.tar.gz nova-8079d82e6c0d419017fdea079fe02fe7cde002d8.tar.xz nova-8079d82e6c0d419017fdea079fe02fe7cde002d8.zip | |
Merge "Continue on the the next tenant_id on 400 codes"
| -rw-r--r-- | nova/network/quantum/melange_ipam_lib.py | 2 |
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 ff46bf041..ad5e4aefb 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 |