diff options
| author | Clark Boylan <clark.boylan@gmail.com> | 2013-01-14 13:58:03 -0800 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2013-01-14 14:00:30 -0800 |
| commit | 09254af268827cf2921387e3a7ef28cf0502e5a5 (patch) | |
| tree | fc8a7aae0bbdbd9b53168b5c3af2556d442d86b4 | |
| parent | b097b59c375c853170954724bbc6bdfff24e08ea (diff) | |
| download | nova-09254af268827cf2921387e3a7ef28cf0502e5a5.tar.gz nova-09254af268827cf2921387e3a7ef28cf0502e5a5.tar.xz nova-09254af268827cf2921387e3a7ef28cf0502e5a5.zip | |
Revert "Populate service list with availability zone"
This reverts commit 20ba7028fc406509c5f8430f79f7153f359d87af. This
commit broke unittests which was not caught due to a bug in the way
testr was run through setup.py. Revert the commit to fix the unittests
so that a fix to the way testr is run can merge.
Change-Id: Ie4644a3177d9628607c0d632190c4e48942070d7
| -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: |