diff options
| author | Russell Bryant <rbryant@redhat.com> | 2013-01-23 08:55:23 -0500 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2013-01-23 08:55:23 -0500 |
| commit | 60c74e3df61d3bf6087b94380079c6d6209b01c9 (patch) | |
| tree | e7617be618c96414aa48c699772b6dcfb10c259c | |
| parent | b512bba76cbed6b602a224521736d79aae3f6c4d (diff) | |
| download | nova-60c74e3df61d3bf6087b94380079c6d6209b01c9.tar.gz nova-60c74e3df61d3bf6087b94380079c6d6209b01c9.tar.xz nova-60c74e3df61d3bf6087b94380079c6d6209b01c9.zip | |
Remove network manager from compute manager.
Remove an instance of the configured network manager from the compute
manager. It's not used anywhere. This was also the only place the
network_manager config option was used, so remove the config import as
well.
Change-Id: I8cfad16e96018e649dd223c3a7132a3860928c23
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 03c54a363..c611cb3e5 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -172,7 +172,6 @@ CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api') CONF.import_opt('console_topic', 'nova.console.rpcapi') CONF.import_opt('host', 'nova.netconf') CONF.import_opt('my_ip', 'nova.netconf') -CONF.import_opt('network_manager', 'nova.service') QUOTAS = quota.QUOTAS @@ -301,8 +300,6 @@ class ComputeManager(manager.SchedulerDependentManager): self.driver = driver.load_compute_driver(self.virtapi, compute_driver) self.network_api = network.API() self.volume_api = volume.API() - self.network_manager = importutils.import_object( - CONF.network_manager, host=kwargs.get('host', None)) self._last_host_check = 0 self._last_bw_usage_poll = 0 self._last_vol_usage_poll = 0 |