From 7f2ed0cc193febe0246604a74bf4b178af70dd1a Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 18 Dec 2012 07:10:28 -0800 Subject: 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 --- nova/compute/manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') 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, -- cgit