From 19558abd2b174f16d74809cd159451effc6d2ac2 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 12 Dec 2012 08:12:11 +0000 Subject: Move network_driver into new nova.network.driver Add a new load_network_driver() function which constrains the use of the network_driver option and move the option into nova.network.driver. blueprint: scope-config-opts Change-Id: I0a839765890093dc871b48435cfd113e0f8e46c4 --- nova/api/manager.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'nova/api') diff --git a/nova/api/manager.py b/nova/api/manager.py index 04607d751..e9b07aa92 100644 --- a/nova/api/manager.py +++ b/nova/api/manager.py @@ -17,11 +17,7 @@ # under the License. from nova import manager -from nova.openstack.common import cfg -from nova.openstack.common import importutils - -CONF = cfg.CONF -CONF.import_opt('network_driver', 'nova.config') +from nova.network import driver class MetadataManager(manager.Manager): @@ -32,7 +28,7 @@ class MetadataManager(manager.Manager): """ def __init__(self, *args, **kwargs): super(MetadataManager, self).__init__(*args, **kwargs) - self.network_driver = importutils.import_module(CONF.network_driver) + self.network_driver = driver.load_network_driver() def init_host(self): """Perform any initialization. -- cgit