diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 10:13:34 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-12 10:13:34 -0400 |
| commit | 0611e3fc3165ce916d83b0fa421e6dafa2b2387e (patch) | |
| tree | e646a054f2719f606037665fa4ab9837179df9fc /nova/api | |
| parent | 8debe1f4164b323b751cd5b01859a08c5e85ab9a (diff) | |
| parent | 8e4cb45399ea4203bcc81d5c67e8197b482a1f8a (diff) | |
| download | nova-0611e3fc3165ce916d83b0fa421e6dafa2b2387e.tar.gz nova-0611e3fc3165ce916d83b0fa421e6dafa2b2387e.tar.xz nova-0611e3fc3165ce916d83b0fa421e6dafa2b2387e.zip | |
merging trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 5 |
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() |