openstack
/
horizon
Code Issues Proposed changes

Merge "Allow OVA upload for images"

This commit is contained in:
Jenkins 2017-01-26 09:31:49 +00:00 committed by Gerrit Code Review
parent 675d3698d0 3f1e0fad92
commit 763d5dd4b3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/project/images/images/forms.py
View File

@ -62,6 +62,12 @@ def create_image_metadata(data):
# 'raw' as the disk format and 'docker' as the container format.
disk_format = 'raw'
container_format = 'docker'
elif disk_format == 'ova':
# If the user wishes to upload an OVA using Horizon, then
# 'ova' must be the container format and 'vmdk' must be the disk
# format.
container_format = 'ova'
disk_format = 'vmdk'
else:
container_format = 'bare'