From bfbaa2c2bffce0e9a81937664dbbe3ebfaeab524 Mon Sep 17 00:00:00 2001
From: gugl <gloria.gu@hpe.com>
Date: Thu, 9 Feb 2017 04:42:02 -0800
Subject: [PATCH] Add vhd and vhdx disk format for volume upload image
Current volume upload image action doesn't support vhd and vhdx
disk format. Added them into the default settings and and volume
upload image.
Close-Bug: #1586915
Change-Id: I18fdd411f716377239962b1d920ba447c101d66f
---
openstack_dashboard/dashboards/project/volumes/volumes/forms.py | 2 +-
openstack_dashboard/local/local_settings.py.example | 1 +
openstack_dashboard/settings.py | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
index 866aa2ea71..2a2d588fe4 100644
--- a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
+++ b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
@@ -41,7 +41,7 @@ from openstack_dashboard.usage import quotas
IMAGE_BACKEND_SETTINGS = getattr(settings, 'OPENSTACK_IMAGE_BACKEND', {})
IMAGE_FORMAT_CHOICES = IMAGE_BACKEND_SETTINGS.get('image_formats', [])
-VALID_DISK_FORMATS = ('raw', 'vmdk', 'vdi', 'qcow2')
+VALID_DISK_FORMATS = ('raw', 'vmdk', 'vdi', 'qcow2', 'vhd', 'vhdx')
DEFAULT_CONTAINER_FORMAT = 'bare'
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
index 7598cdf959..633aa4bcab 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -354,6 +354,7 @@ OPENSTACK_HEAT_STACK = {
# ('raw', _('Raw')),
# ('vdi', _('VDI - Virtual Disk Image')),
# ('vhd', _('VHD - Virtual Hard Disk')),
+# ('vhdx', _('VHDX - Large Virtual Hard Disk')),
# ('vmdk', _('VMDK - Virtual Machine Disk')),
# ],
#}
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
index 4e6a204074..71d3af3505 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -97,6 +97,7 @@ OPENSTACK_IMAGE_BACKEND = {
('raw', _('Raw')),
('vdi', _('VDI - Virtual Disk Image')),
('vhd', _('VHD - Virtual Hard Disk')),
+ ('vhdx', _('VHDX - Large Virtual Hard Disk')),
('vmdk', _('VMDK - Virtual Machine Disk')),
]
}