x
/
nova-lxd
Code Issues Proposed changes

Merge pull request #40 from zulcss/master 

Fix image_properties handling
This commit is contained in:
Chuck Short 2015-09-28 13:03:20 -04:00
parent 2c8694facc 6f868d5f69
commit 9de22a5ff8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nclxd/nova/virt/lxd/container_image.py
View File

@ -100,16 +100,17 @@ class LXDContainerImage(object):
target_tarball = tarfile.open(container_manifest, "w:")
image_prop = image_meta.get('properties')
metadata = {
'architecture': image_meta.properties.get('architecture',
os.uname()[4]),
'architecture': image_prop.get('architecture',
os.uname()[4]),
'creation_date': int(os.stat(container_manifest).st_ctime),
'properties': {
'os': image_meta.properties.get('os_distro', 'None'),
'architecture': image_meta.get.properties('architecture',
os.uname()[4]),
'description': image_meta.properties.get('description',
None),
'os': image_prop.get('os_distro', 'None'),
'architecture': image_prop.get('architecture',
os.uname()[4]),
'description': image_prop.get('description',
None),
'name': instance.image_ref
}
}