From 09254af268827cf2921387e3a7ef28cf0502e5a5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 14 Jan 2013 13:58:03 -0800 Subject: 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 --- nova/api/openstack/compute/contrib/services.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'nova/api') 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: -- cgit