summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2013-01-14 12:44:32 -0500
committerDan Smith <danms@us.ibm.com>2013-01-16 11:35:57 -0500
commit25f31490705864a8c3afe507bb0188fd66a42096 (patch)
tree4cf029c9b8cc9643c81bca90a9444c63b118af96
parentb709a9a80851d3c2c6242da960a318433d1f4aee (diff)
downloadnova-25f31490705864a8c3afe507bb0188fd66a42096.tar.gz
nova-25f31490705864a8c3afe507bb0188fd66a42096.tar.xz
nova-25f31490705864a8c3afe507bb0188fd66a42096.zip
Make resource tracker use conductor for listing compute nodes
This makes the resource tracker use the existing conductor method of service_get_all_compute_by_host() instead of querying the database directly. Related to blueprint no-db-compute Change-Id: Iee19eeaa8651e4df0abb974f3f3ddeafd9d23409
-rw-r--r--nova/compute/resource_tracker.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index a4bb92425..a02a998b6 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -309,7 +309,8 @@ class ResourceTracker(object):
def _get_service(self, context):
try:
- return db.service_get_by_compute_host(context, self.host)
+ return self.conductor_api.service_get_by_compute_host(context,
+ self.host)
except exception.NotFound:
LOG.warn(_("No service record for host %s"), self.host)