Merge "Use id to identify images from Glance"

This commit is contained in:
Jenkins 2017-10-09 17:03:42 +00:00 committed by Gerrit Code Review
commit 6ebb3de3d2
1 changed files with 3 additions and 3 deletions

View File

@ -87,14 +87,14 @@ def get_images():
'Openstack Exception: %s') % str(e))
else:
for image in client.images.list():
image_name = image.name.encode('ascii', 'ignore')
image_id = image.id.encode('ascii', 'ignore')
metadata = ["architecture", "type", "distribution", "version",
"os_distro", "os_type", "os_version"]
if any(key in image.keys() for key in metadata):
IMAGES[image_name] = {}
IMAGES[image_id] = {}
for key in metadata:
if key in image.keys():
IMAGES[image_name][key] = image[key]
IMAGES[image_id][key] = image[key]
if not IMAGES:
IMAGES = PREDEF_IMAGES