diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-10 00:39:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-10 00:39:58 +0000 |
| commit | 88b5e07717352d9ae7149a9d2cc6b56539991f31 (patch) | |
| tree | bdf5986000cfdbca22ca8c93a890b3e3ff67cf2f /nova/api | |
| parent | f936594d9e37abf4d8c22c2545a9b67ed8f25c90 (diff) | |
| parent | c3cdf8c2384fa124c39ed2b38723a1659ab1f474 (diff) | |
Merge "Fixes os-volume/snapshot delete"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/volumes.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/volumes.py b/nova/api/openstack/compute/contrib/volumes.py index 6532753c5..51d4a49a9 100644 --- a/nova/api/openstack/compute/contrib/volumes.py +++ b/nova/api/openstack/compute/contrib/volumes.py @@ -481,7 +481,8 @@ class SnapshotController(object): LOG.audit(_("Delete snapshot with id: %s"), id, context=context) try: - self.volume_api.delete_snapshot(context, snapshot_id=id) + snapshot = self.volume_api.get_snapshot(context, id) + self.volume_api.delete_snapshot(context, snapshot) except exception.NotFound: return exc.HTTPNotFound() return webob.Response(status_int=202) |