equal
deleted
inserted
replaced
1 Internal patch to only enable the current supported boot source (Boot |
1 Internal patch to only enable the current supported boot source option (Boot |
2 from Image). This patch will not be committed upstream. |
2 from Image). This patch will not be committed upstream. |
3 |
3 |
4 --- horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.~1~ 2014-10-16 06:20:50.000000000 -0700 |
4 --- horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.orig 2015-12-12 12:05:17.628569744 -0500 |
5 +++ horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2014-10-24 11:58:37.591052103 -0700 |
5 +++ horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2015-12-12 12:08:12.789789554 -0500 |
6 @@ -141,22 +141,7 @@ class SetInstanceDetailsAction(workflows |
6 @@ -153,24 +153,7 @@ |
7 source_type_choices = [ |
7 source_type_choices = [ |
8 ('', _("Select source")), |
8 ('', _("Select source")), |
9 ("image_id", _("Boot from image")), |
9 ("image_id", _("Boot from image")), |
10 - ("instance_snapshot_id", _("Boot from snapshot")), |
10 - ("instance_snapshot_id", _("Boot from snapshot")), |
11 ] |
11 ] |
13 - source_type_choices.append(("volume_id", _("Boot from volume"))) |
13 - source_type_choices.append(("volume_id", _("Boot from volume"))) |
14 - |
14 - |
15 - try: |
15 - try: |
16 - if api.nova.extension_supported("BlockDeviceMappingV2Boot", |
16 - if api.nova.extension_supported("BlockDeviceMappingV2Boot", |
17 - request): |
17 - request): |
18 - source_type_choices.append(("volume_image_id", |
18 - source_type_choices.append( |
19 - _("Boot from image (creates a new volume)"))) |
19 - ("volume_image_id", |
|
20 - _("Boot from image (creates a new volume)"))) |
20 - except Exception: |
21 - except Exception: |
21 - exceptions.handle(request, _('Unable to retrieve extensions ' |
22 - exceptions.handle(request, _('Unable to retrieve extensions ' |
22 - 'information.')) |
23 - 'information.')) |
23 - |
24 - |
24 - source_type_choices.append(("volume_snapshot_id", |
25 - source_type_choices.append( |
25 - _("Boot from volume snapshot (creates a new volume)"))) |
26 - ("volume_snapshot_id", |
|
27 - _("Boot from volume snapshot (creates a new volume)"))) |
26 self.fields['source_type'].choices = source_type_choices |
28 self.fields['source_type'].choices = source_type_choices |
27 |
29 |
28 def clean(self): |
30 @memoized.memoized_method |