diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-18 21:46:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-18 21:46:50 +0000 |
| commit | 32f16dcbe398170139a6a9127803bbd1d046460b (patch) | |
| tree | ec63962ed3b2fed994dbc807620c3eca0801a255 /nova/api | |
| parent | 4222329b8129cbb4db2c2df98ad4817f8e696c08 (diff) | |
| parent | 19558abd2b174f16d74809cd159451effc6d2ac2 (diff) | |
Merge "Move network_driver into new nova.network.driver"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/manager.py | 8 |
1 files changed, 2 insertions, 6 deletions
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. |