openstack/nova
Code Issues Proposed changes

Merge "Align internal image API with volume and network"

Browse Source
This commit is contained in:
Jenkins
2014-05-25 08:34:43 +00:00
committed by Gerrit Code Review
parent 76d6dee94d 5122269147
commit b2f875cd10
13 changed files with 256 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/servers.py
View File

@@ -1443,13 +1443,11 @@ class Controller(wsgi.Controller):
img = instance['image_ref']
if not img:
props = bdms.root_metadata(
context, self.compute_api.image_service,
context, self.compute_api.image_api,
self.compute_api.volume_api)
image_meta = {'properties': props}
else:
src_image = self.compute_api.image_service.\
show(context, img)
image_meta = dict(src_image)
image_meta = self.compute_api.image_api.get(context, img)
image = self.compute_api.snapshot_volume_backed(
context,