summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Wendlandt <dan@nicira.com>2011-09-01 09:42:44 -0700
committerDan Wendlandt <dan@nicira.com>2011-09-01 09:42:44 -0700
commit35c4cecc8d29da32bd816bb68f8b45c2d03f892f (patch)
tree84dc4390022e1f8d831e8e3d92075af7e18248bb
parent5b3b3d1b357c085c2088df7d76df8392118fb82e (diff)
downloadnova-35c4cecc8d29da32bd816bb68f8b45c2d03f892f.tar.gz
nova-35c4cecc8d29da32bd816bb68f8b45c2d03f892f.tar.xz
nova-35c4cecc8d29da32bd816bb68f8b45c2d03f892f.zip
undo change in setting q_tenant_id in quantum_manager.create_network
-rw-r--r--nova/network/quantum/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py
index 709299dd2..153f6c0f2 100644
--- a/nova/network/quantum/manager.py
+++ b/nova/network/quantum/manager.py
@@ -86,7 +86,7 @@ class QuantumManager(manager.FlatManager):
if num_networks != 1:
raise Exception(_("QuantumManager requires that only one"
" network is created per call"))
- q_tenant_id = kwargs.get("project_id", FLAGS.quantum_default_tenant_id)
+ q_tenant_id = kwargs["project_id"] or FLAGS.quantum_default_tenant_id
quantum_net_id = uuid
if quantum_net_id:
if not self.q_conn.network_exists(q_tenant_id, quantum_net_id):