diff options
| author | Dan Smith <danms@us.ibm.com> | 2012-12-18 07:10:28 -0800 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2012-12-19 08:14:45 -0800 |
| commit | 7f2ed0cc193febe0246604a74bf4b178af70dd1a (patch) | |
| tree | 868d11ba2c055cf4359c43fca3b1e22191af957e /nova/compute | |
| parent | 0e17114aacbb6fb71477629ca8d0a1992d9ea119 (diff) | |
Move aggregate_get() to conductor
This moves the final remaining aggregate DB operation from the
compute/manager to conductor/manager.
Related to bp/no-db-compute-manager
Change-Id: I1ec6b64d29da21f978f7b72a1f8271fe68e3a44d
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6efc83fb9..7c33a8c8a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3347,7 +3347,7 @@ class ComputeManager(manager.SchedulerDependentManager): aggregate=None, aggregate_id=None): """Notify hypervisor of change (for hypervisor pools).""" if not aggregate: - aggregate = self.db.aggregate_get(context, aggregate_id) + aggregate = self.conductor_api.aggregate_get(context, aggregate_id) try: self.driver.add_to_aggregate(context, aggregate, host, @@ -3364,7 +3364,7 @@ class ComputeManager(manager.SchedulerDependentManager): aggregate=None, aggregate_id=None): """Removes a host from a physical hypervisor pool.""" if not aggregate: - aggregate = self.db.aggregate_get(context, aggregate_id) + aggregate = self.conductor_api.aggregate_get(context, aggregate_id) try: self.driver.remove_from_aggregate(context, aggregate, host, |