diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 19:14:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 19:14:54 +0000 |
| commit | 425af8913b6cb89758278e69654f68201c91c18b (patch) | |
| tree | f947fb6d78f5d7a86e07e2f4957baeea4fcea24d /nova/api | |
| parent | ff2542a3e58023193f9ec23f70a0b6bd92499a85 (diff) | |
| parent | fc42f76b24df376c89f94a177f2476dacbc87073 (diff) | |
Merge "Populate service list with availability zone and correct unit test"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/services.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index c792c72da..2786ad814 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -21,6 +21,7 @@ import webob.exc from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil +from nova import availability_zones from nova import db from nova import exception from nova.openstack.common import cfg @@ -69,6 +70,7 @@ class ServiceController(object): authorize(context) now = timeutils.utcnow() services = db.service_get_all(context) + services = availability_zones.set_availability_zones(context, services) host = '' if 'host' in req.GET: |