diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-24 16:26:44 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-24 16:26:44 +0000 |
| commit | 809cbdb96ff3173a85465ad60770bc7032ac0aae (patch) | |
| tree | cf91a580dc9cf843c3747a4a858f35824ab4bcb1 /nova/compute | |
| parent | c53e56576ead57815f3542a7faa797e5d0135e0c (diff) | |
| parent | 964dbe0ee380877e21465647f0e57d28f7897d98 (diff) | |
Aggregates capabilities from Compute, Network, Volume to the ZoneManager in Scheduler.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7316d1510..468771f46 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -111,7 +111,7 @@ def checks_instance_lock(function): return decorated_function -class ComputeManager(manager.Manager): +class ComputeManager(manager.SchedulerDependentManager): """Manages the running instances from creation to destruction.""" @@ -132,7 +132,8 @@ class ComputeManager(manager.Manager): self.network_manager = utils.import_object(FLAGS.network_manager) self.volume_manager = utils.import_object(FLAGS.volume_manager) - super(ComputeManager, self).__init__(*args, **kwargs) + super(ComputeManager, self).__init__(service_name="compute", + *args, **kwargs) def init_host(self): """Do any initialization that needs to be run if this is a |