From 9553d5eb82f39db8f20fa7995a857e0609e9ac42 Mon Sep 17 00:00:00 2001
From: Aaron Rosen <arosen@nicira.com>
Date: Fri, 22 Feb 2013 10:58:41 -0800
Subject: Add missing import_opt for flat_injected

Fixes bug 1131891

Change-Id: I993798abea27b8d37efe5d3c122a490d85e192a8
---
 nova/network/quantumv2/api.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py
index a177c1ac0..851a544dc 100644
--- a/nova/network/quantumv2/api.py
+++ b/nova/network/quantumv2/api.py
@@ -72,6 +72,7 @@ quantum_opts = [
 CONF = cfg.CONF
 CONF.register_opts(quantum_opts)
 CONF.import_opt('default_floating_pool', 'nova.network.floating_ips')
+CONF.import_opt('flat_injected', 'nova.network.manager')
 LOG = logging.getLogger(__name__)
 
 NET_EXTERNAL = 'router:external'
-- 
cgit