From dc5a29d8bd5f041c3864aed915f8ceb70ce7978a Mon Sep 17 00:00:00 2001
From: Jason Kölker <jason@koelker.net>
Date: Wed, 28 Mar 2012 11:15:00 -0500
Subject: Continue on the the next tenant_id on 400 codes

* Melange connection raises Exception if the response is > 400
* Fixes lp967261

Change-Id: I4592e5907276d290f4a54aa27dd4e91a62cc83e8
---
 nova/network/quantum/melange_ipam_lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit