| author | david.comay@oracle.com |
| Fri, 09 Sep 2016 16:31:02 -0700 | |
| changeset 6878 | 252671ed151a |
| parent 6856 | 356aeea98c39 |
| permissions | -rw-r--r-- |
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
1 |
Internal patch to disable the image_source (Create Volume -> Volume |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
2 |
Source -> image) because copy_volume_from_image is not supported yet. |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
This patch will not be committed upstream. |
|
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
|
|
6856
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
5 |
--- horizon-9.0.1/openstack_dashboard/dashboards/project/volumes/volumes/forms.py.~1~ 2016-06-02 13:05:51.000000000 -0700 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
6 |
+++ horizon-9.0.1/openstack_dashboard/dashboards/project/volumes/volumes/forms.py 2016-06-29 23:54:56.869785260 -0700 |
|
356aeea98c39
24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
7 |
@@ -230,6 +230,9 @@ class CreateForm(forms.SelfHandlingForm) |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
|
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
9 |
images = utils.get_available_images(request, |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
10 |
request.user.tenant_id) |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
11 |
+ # Disable the image source on Solaris |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
12 |
+ images = False |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
13 |
+ |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
14 |
if images: |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
15 |
source_type_choices.append(("image_source", _("Image")))
|
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
16 |
choices = [('', _("Choose an image"))]
|