diff options
| author | Gabe Westmaas <gabe.westmaas@rackspace.com> | 2011-08-05 01:29:39 +0000 |
|---|---|---|
| committer | Gabe Westmaas <gabe.westmaas@rackspace.com> | 2011-08-05 01:29:39 +0000 |
| commit | 02bf32d40cba09a688583e684f4b55dace1ee20a (patch) | |
| tree | dcdcc328ea2d8c80f4fa1114e884958b15bc882e /nova/api | |
| parent | 5b463f5d14c62f66250d5edc3edbd2ded704e0da (diff) | |
| parent | 0fea610a6918089c53cc33335a4db4557820675f (diff) | |
Merge from trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/images.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py index 0834adfa5..c76738d30 100644 --- a/nova/api/openstack/images.py +++ b/nova/api/openstack/images.py @@ -116,13 +116,17 @@ class ControllerV10(Controller): try: image_name = image["name"] - server_id = image["serverId"] + instance_id = image["serverId"] except KeyError as missing_key: msg = _("Image entity requires %s") % missing_key raise webob.exc.HTTPBadRequest(explanation=msg) context = req.environ["nova.context"] - image = self._compute_service.snapshot(context, server_id, image_name) + props = {'instance_id': instance_id} + image = self._compute_service.snapshot(context, + instance_id, + image_name, + extra_properties=props) return dict(image=self.get_builder(req).build(image, detail=True)) |