| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:42 -0700 | |
| changeset 6856 | 356aeea98c39 |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
1 |
In-house patch to add zfs image type to edit image dropdown. This |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
2 |
patch has not yet been submitted upstream. |
|
4552
232fe134fd76
21303465 edit image window has no ZFS disk format option
Brian Reitz <Brian.Reitz@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
4 |
--- horizon-9.1.0/openstack_dashboard/settings.py.~1~ 2016-07-21 03:24:05.000000000 +0000 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
5 |
+++ horizon-9.1.0/openstack_dashboard/settings.py 2016-09-02 10:50:15.882844385 +0000 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
6 |
@@ -99,6 +99,7 @@ OPENSTACK_IMAGE_BACKEND = {
|
|
5405
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 |
} |
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
13 |