diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-16 17:43:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-16 17:43:32 +0000 |
| commit | 18c3ea2985f186981ebba61dd17a56346cf6e7d3 (patch) | |
| tree | 8edf689fe13b1d812c5aae651a1457b9a3215887 | |
| parent | 3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879 (diff) | |
| parent | 25f31490705864a8c3afe507bb0188fd66a42096 (diff) | |
| download | nova-18c3ea2985f186981ebba61dd17a56346cf6e7d3.tar.gz nova-18c3ea2985f186981ebba61dd17a56346cf6e7d3.tar.xz nova-18c3ea2985f186981ebba61dd17a56346cf6e7d3.zip | |
Merge "Make resource tracker use conductor for listing compute nodes"
| -rw-r--r-- | nova/compute/resource_tracker.py | 3 |
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) |