author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 05 Feb 2016 17:54:17 -0500 | |
changeset 5405 | 66fd59fecd68 |
parent 4552 | 232fe134fd76 |
child 6856 | 356aeea98c39 |
permissions | -rw-r--r-- |
4552
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
1 |
In-house patch to add zfs image type to edit image dropdown. |
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
2 |
This patch has not yet been submitted upstream. |
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
3 |
|
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
4 |
--- horizon-2014.2.2/openstack_dashboard/settings.py.orig 2015-06-24 07:39:37.989679425 -0700 |
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ horizon-2014.2.2/openstack_dashboard/settings.py 2015-06-24 07:40:27.133978973 -0700 |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4552
diff
changeset
|
6 |
@@ -88,6 +88,7 @@ OPENSTACK_IMAGE_BACKEND = { |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4552
diff
changeset
|
7 |
('vdi', _('VDI - Virtual Disk Image')), |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4552
diff
changeset
|
8 |
('vhd', _('VHD - Virtual Hard Disk')), |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4552
diff
changeset
|
9 |
('vmdk', _('VMDK - Virtual Machine Disk')), |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4552
diff
changeset
|
10 |
+ ('zfs', _('ZFS - Solaris ZFS Image')), |
4552
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
11 |
] |
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
12 |
} |