diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-23 03:32:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-23 03:32:19 +0000 |
| commit | 84f2c622b97e1f65f99e8fe57edf1c7292f040af (patch) | |
| tree | d9aa65db4dc4f7004508393714db6f64df26fb13 | |
| parent | ad3a110299acd0d3be2b43991216fec5e6396578 (diff) | |
| parent | 9553d5eb82f39db8f20fa7995a857e0609e9ac42 (diff) | |
Merge "Add missing import_opt for flat_injected"
| -rw-r--r-- | nova/network/quantumv2/api.py | 1 |
1 files changed, 1 insertions, 0 deletions
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' |