openstack
/
horizon
Code Issues Proposed changes

Merge "Add support for OVA images in Horizon"

This commit is contained in:
Jenkins 2015-02-02 18:43:25 +00:00 committed by Gerrit Code Review
parent bdaf50455c c42ed5b1ee
commit f112869e8b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/local/local_settings.py.example
View File

@ -211,11 +211,12 @@ OPENSTACK_NEUTRON_NETWORK = {
# ('ami', _('AMI - Amazon Machine Image')),
# ('ari', _('ARI - Amazon Ramdisk Image')),
# ('iso', _('ISO - Optical Disk Image')),
# ('ova', _('OVA - Open Virtual Appliance')),
# ('qcow2', _('QCOW2 - QEMU Emulator')),
# ('raw', _('Raw')),
# ('vdi', _('VDI')),
# ('vhd', _('VHD')),
# ('vmdk', _('VMDK'))
# ('vdi', _('VDI - Virtual Disk Image')),
# ('vhd', ('VHD - Virtual Hard Disk')),
# ('vmdk', _('VMDK - Virtual Machine Disk'))
# ]
# }

7
openstack_dashboard/settings.py
View File

@ -86,11 +86,12 @@ OPENSTACK_IMAGE_BACKEND = {
('ami', _('AMI - Amazon Machine Image')),
('ari', _('ARI - Amazon Ramdisk Image')),
('iso', _('ISO - Optical Disk Image')),
('ova', _('OVA - Open Virtual Appliance')),
('qcow2', _('QCOW2 - QEMU Emulator')),
('raw', _('Raw')),
('vdi', _('VDI')),
('vhd', _('VHD')),
('vmdk', _('VMDK'))
('vdi', _('VDI - Virtual Disk Image')),
('vhd', _('VHD - Virtual Hard Disk')),
('vmdk', _('VMDK - Virtual Machine Disk'))
]
}