diff options
| author | Michael J Fork <mjfork@us.ibm.com> | 2013-01-14 13:45:23 +0000 |
|---|---|---|
| committer | Michael J Fork <mjfork@us.ibm.com> | 2013-01-14 13:45:23 +0000 |
| commit | 20ba7028fc406509c5f8430f79f7153f359d87af (patch) | |
| tree | 68fc4e4ad90aa488e60d70a0c7babdb525b7d47a /nova/api | |
| parent | ca4b1303804e94f10f0e4e6c4a9e09c049efd1ee (diff) | |
Populate service list with availability zone
Fixes bug 1099399
Availability zone was removed from the service object and is now added
via a separate call to availabilty_zones.set_availability_zones
Change-Id: I89126bb72e482f3ce701a9e28035416805a639a0
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: |