diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 01:02:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 01:02:43 +0000 |
| commit | fe3ab76b82e9242c18a98cb988f213aaec10ddce (patch) | |
| tree | 93f374d0aef7285a3f58eb0c5d0cc6887408b33e /nova/api | |
| parent | ce0a7700595c57db132c2c07704c29e88a078dda (diff) | |
| parent | 09254af268827cf2921387e3a7ef28cf0502e5a5 (diff) | |
Merge "Revert "Populate service list with availability zone""
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/services.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/services.py b/nova/api/openstack/compute/contrib/services.py index 2786ad814..c792c72da 100644 --- a/nova/api/openstack/compute/contrib/services.py +++ b/nova/api/openstack/compute/contrib/services.py @@ -21,7 +21,6 @@ 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 @@ -70,7 +69,6 @@ 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: |