summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-06 22:25:57 +0000
committerGerrit Code Review <review@openstack.org>2013-02-06 22:25:57 +0000
commit749c3db3f63f70d9a71ff26e253b3eeda5d9d742 (patch)
tree714012474f0f51cd1e92e4142a24ae68547b7062 /nova/api
parentab987734228f00afb34d7a1cb22f693d29a520fe (diff)
parent0dbd2c5d3360a71658a146cb3947047e797a56f6 (diff)
downloadnova-749c3db3f63f70d9a71ff26e253b3eeda5d9d742.tar.gz
nova-749c3db3f63f70d9a71ff26e253b3eeda5d9d742.tar.xz
nova-749c3db3f63f70d9a71ff26e253b3eeda5d9d742.zip
Merge "Cells: Add support for compute HostAPI()"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/hosts.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index d1b39d6db..9ce278900 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -124,11 +124,12 @@ class HostController(object):
"""
context = req.environ['nova.context']
authorize(context)
- filters = {}
+ filters = {'disabled': False}
zone = req.GET.get('zone', None)
if zone:
filters['availability_zone'] = zone
- services = self.api.service_get_all(context, filters=filters)
+ services = self.api.service_get_all(context, filters=filters,
+ set_zones=True)
hosts = []
for service in services:
hosts.append({'host_name': service['host'],