diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-23 17:31:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-23 17:31:17 +0000 |
| commit | a792bc5cfcf418a78f592aad6286f20f4f46ab4f (patch) | |
| tree | 20bc1bffcbd32b51e4996c401d354663d982cc42 | |
| parent | b1a2b077f1f89acb79bb1110ae17cf431aeea0d6 (diff) | |
| parent | 60c74e3df61d3bf6087b94380079c6d6209b01c9 (diff) | |
| download | nova-a792bc5cfcf418a78f592aad6286f20f4f46ab4f.tar.gz nova-a792bc5cfcf418a78f592aad6286f20f4f46ab4f.tar.xz nova-a792bc5cfcf418a78f592aad6286f20f4f46ab4f.zip | |
Merge "Remove network manager from compute manager."
| -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 d006ea049..d1cffea7d 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 |