From c42ed5b1eec1c5193e29c9871686a4013db760f1 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Wed, 28 Jan 2015 12:07:49 +0100 Subject: [PATCH] Add support for OVA images in Horizon This is supported in glance etc. Add additional descriptions to image backend formats. Change-Id: I839a4f17cfc75dbec8c753721bc1dbd8c7a8d578 Closes-Bug: #1415418 --- openstack_dashboard/local/local_settings.py.example | 7 ++++--- openstack_dashboard/settings.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 0b361a0d24..647732cad1 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -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')) # ] # } diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index 16eb4795ca..cef701080b 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -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')) ] }