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