summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-09-12 07:36:14 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-09-12 07:36:14 -0700
commit043a13690dc4f2ba20965cced85d705e59f7406b (patch)
treed385fe22f81b435e8cb56a774f5244db7b45637c /nova/api
parenta27aa5dce2788560b29fd33b4805acf0190a27e3 (diff)
parent66dd77887641f9db5f690f871b0cfb4d381d6a3e (diff)
downloadnova-043a13690dc4f2ba20965cced85d705e59f7406b.tar.gz
nova-043a13690dc4f2ba20965cced85d705e59f7406b.tar.xz
nova-043a13690dc4f2ba20965cced85d705e59f7406b.zip
bug fixes
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index d084ac360..f5447edc5 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -334,9 +334,8 @@ class Controller(object):
LOG.exception(msg)
raise exc.HTTPBadRequest(explanation=msg)
try:
- # TODO(gundlach): pass reboot_type, support soft reboot in
- # virt driver
- self.compute_api.reboot(req.environ['nova.context'], id)
+ self.compute_api.reboot(req.environ['nova.context'], id,
+ reboot_type)
except Exception, e:
LOG.exception(_("Error in reboot %s"), e)
raise exc.HTTPUnprocessableEntity()