openstack/shade
Code Issues Proposed changes

Merge "Handle image name for boot from volume"

Browse Source
This commit is contained in:
Jenkins 2015-03-17 12:52:46 +00:00 committed by Gerrit Code Review
commit b7538a38d3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shade/meta.py
View File

@ -112,10 +112,15 @@ def get_hostvars_from_server(cloud, server, mounts=None):
if flavor_name:
server_vars['flavor']['name'] = flavor_name
image_id = server.image['id']
image_name = cloud.get_image_name(image_id)
if image_name:
server_vars['image']['name'] = image_name
# OpenStack can return image as a string when you've booted from volume
if unicode(server.image) == server.image:
image_id = server.image
else:
image_id = server.image.get('id', None)
if image_id:
image_name = cloud.get_image_name(image_id)
if image_name:
server_vars['image']['name'] = image_name
volumes = []
for vol in cloud.get_volumes(server):