diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-25 20:24:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-25 20:24:25 +0000 |
| commit | ae2aa3c2c2211d9c5670a05b02782706b4c19f01 (patch) | |
| tree | 0a16c8eff8a051744ea549649673b644a98c113a /nova/api | |
| parent | 74b58f8e76d4fcbc56193326551617010af6afa2 (diff) | |
| parent | fb04fdb7576ec1885be93d4e67b61cebeb06a699 (diff) | |
| download | nova-ae2aa3c2c2211d9c5670a05b02782706b4c19f01.tar.gz nova-ae2aa3c2c2211d9c5670a05b02782706b4c19f01.tar.xz nova-ae2aa3c2c2211d9c5670a05b02782706b4c19f01.zip | |
Merge "Add missing info to docstring."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/hosts.py | 33 |
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 925ded736..0c910bb8a 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -99,23 +99,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) |