diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-10 19:13:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-10 19:13:35 +0000 |
| commit | a7abc32cfe6efe865c7a31c260bc0e145764f602 (patch) | |
| tree | f032b3be26ba59752c85e943713104735e0752af /nova/api | |
| parent | 3b0ef1fb2e3110fbedc75a30475d799599706ced (diff) | |
| parent | acb6d78c56cfc3e9e0392d1020ce72225ff1db65 (diff) | |
Merge "Send host not ComputeNode into uptime RPC call."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/hypervisors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py index 33aaa014b..2760e6c19 100644 --- a/nova/api/openstack/compute/contrib/hypervisors.py +++ b/nova/api/openstack/compute/contrib/hypervisors.py @@ -197,7 +197,8 @@ class HypervisorsController(object): # Get the uptime try: - uptime = self.api.get_host_uptime(context, hyp) + host = hyp['service']['host'] + uptime = self.api.get_host_uptime(context, host) except NotImplementedError: msg = _("Virt driver does not implement uptime function.") raise webob.exc.HTTPNotImplemented(explanation=msg) |