5403N/AInternal patch to only enable the current supported boot source option (Boot

3998N/Afrom Image). This patch will not be committed upstream.

2961N/A

6854N/A--- horizon-9.0.0.0rc1/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.~1~ 2016-03-30 02:39:18.483954433 -0700

6854N/A+++ horizon-9.0.0.0rc1/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2016-03-30 02:41:14.550222691 -0700

6854N/A@@ -154,25 +154,9 @@ class SetInstanceDetailsAction(workflows

2961N/A source_type_choices = [

3998N/A ('', _("Select source")),

2961N/A ("image_id", _("Boot from image")),

2961N/A- ("instance_snapshot_id", _("Boot from snapshot")),

2961N/A ]

6854N/A- if cinder.is_volume_service_enabled(request):

2961N/A- source_type_choices.append(("volume_id", _("Boot from volume")))

2961N/A-

2961N/A- try:

2961N/A- if api.nova.extension_supported("BlockDeviceMappingV2Boot",

2961N/A- request):

5403N/A- source_type_choices.append(

5403N/A- ("volume_image_id",

5403N/A- _("Boot from image (creates a new volume)")))

2961N/A- except Exception:

2961N/A- exceptions.handle(request, _('Unable to retrieve extensions '

5403N/A- 'information.'))

2961N/A-

5403N/A- source_type_choices.append(

5403N/A- ("volume_snapshot_id",

5403N/A- _("Boot from volume snapshot (creates a new volume)")))

2961N/A self.fields['source_type'].choices = source_type_choices

5798N/A+ self.fields['source_type'].initial = source_type_choices[1][0]

6854N/A

5403N/A @memoized.memoized_method

5798N/A def _get_flavor(self, flavor_id):