author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 05 Feb 2016 17:54:17 -0500 | |
changeset 5405 | 66fd59fecd68 |
parent 3998 | 5bd484384122 |
child 5800 | 65c7ff58de8e |
permissions | -rw-r--r-- |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
1 |
Internal patch to only enable the current supported boot source option (Boot |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
1989
diff
changeset
|
2 |
from Image). This patch will not be committed upstream. |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
3 |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
4 |
--- horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.orig 2015-12-12 12:05:17.628569744 -0500 |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
5 |
+++ horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2015-12-12 12:08:12.789789554 -0500 |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
6 |
@@ -153,24 +153,7 @@ |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
7 |
source_type_choices = [ |
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
1989
diff
changeset
|
8 |
('', _("Select source")), |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
9 |
("image_id", _("Boot from image")), |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
10 |
- ("instance_snapshot_id", _("Boot from snapshot")), |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
11 |
] |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
12 |
- if base.is_service_enabled(request, 'volume'): |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
13 |
- source_type_choices.append(("volume_id", _("Boot from volume"))) |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
14 |
- |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
15 |
- try: |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
16 |
- if api.nova.extension_supported("BlockDeviceMappingV2Boot", |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
17 |
- request): |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
18 |
- source_type_choices.append( |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
19 |
- ("volume_image_id", |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
20 |
- _("Boot from image (creates a new volume)"))) |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
21 |
- except Exception: |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
22 |
- exceptions.handle(request, _('Unable to retrieve extensions ' |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
23 |
- 'information.')) |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
24 |
- |
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
25 |
- source_type_choices.append( |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
26 |
- ("volume_snapshot_id", |
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
27 |
- _("Boot from volume snapshot (creates a new volume)"))) |
1989
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
28 |
self.fields['source_type'].choices = source_type_choices |
ae222899e270
19061438 checkboxes related with 'create volume from Image' in the Horizon don't work
Strony <strony.zhang@oracle.com>
parents:
diff
changeset
|
29 |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
30 |
@memoized.memoized_method |