summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/hosts.py33
1 files changed, 24 insertions, 9 deletions
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 3727f35d9..7e9f3f6a6 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -98,23 +98,38 @@ class HostController(object):
:returns: A dict in the format:
{'hosts': [{'host_name': 'some.host.name',
- 'service': 'cells'},
+ 'service': 'cells',
+ 'zone': 'internal'},
{'host_name': 'some.other.host.name',
- 'service': 'cells'},
+ 'service': 'cells',
+ 'zone': 'internal'},
{'host_name': 'some.celly.host.name',
- 'service': 'cells'},
+ 'service': 'cells',
+ 'zone': 'internal'},
{'host_name': 'console1.host.com',
- 'service': 'consoleauth'},
+ 'service': 'consoleauth',
+ 'zone': 'internal'},
{'host_name': 'network1.host.com',
- 'service': 'network'},
+ 'service': 'network',
+ 'zone': 'internal'},
{'host_name': 'netwwork2.host.com',
- 'service': 'network'},
+ 'service': 'network',
+ 'zone': 'internal'},
+ {'host_name': 'compute1.host.com',
+ 'service': 'compute',
+ 'zone': 'nova'},
+ {'host_name': 'compute2.host.com',
+ 'service': 'compute',
+ 'zone': 'nova'},
{'host_name': 'sched1.host.com',
- 'service': 'scheduler'},
+ 'service': 'scheduler',
+ 'zone': 'internal'},
{'host_name': 'sched2.host.com',
- 'service': 'scheduler'},
+ 'service': 'scheduler',
+ 'zone': 'internal'},
{'host_name': 'vol1.host.com',
- 'service': 'volume'}]}
+ 'service': 'volume'},
+ 'zone': 'internal']}
"""
context = req.environ['nova.context']
authorize(context)