components/openstack/horizon/patches/05-disable-unsupported-bootsource.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4072 db0cec748ec0
child 5800 65c7ff58de8e
--- a/components/openstack/horizon/patches/05-disable-unsupported-bootsource.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/horizon/patches/05-disable-unsupported-bootsource.patch	Fri May 20 17:42:29 2016 -0400
@@ -1,9 +1,9 @@
-Internal patch to only enable the current supported boot source (Boot
+Internal patch to only enable the current supported boot source option (Boot
 from Image).  This patch will not be committed upstream.
 
---- horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.~1~	2014-10-16 06:20:50.000000000 -0700
-+++ horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py	2014-10-24 11:58:37.591052103 -0700
-@@ -141,22 +141,7 @@ class SetInstanceDetailsAction(workflows
+--- horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.orig	2015-12-12 12:05:17.628569744 -0500
++++ horizon-2015.1.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py	2015-12-12 12:08:12.789789554 -0500
+@@ -153,24 +153,7 @@
          source_type_choices = [
              ('', _("Select source")),
              ("image_id", _("Boot from image")),
@@ -15,14 +15,16 @@
 -            try:
 -                if api.nova.extension_supported("BlockDeviceMappingV2Boot",
 -                                                request):
--                    source_type_choices.append(("volume_image_id",
--                            _("Boot from image (creates a new volume)")))
+-                    source_type_choices.append(
+-                        ("volume_image_id",
+-                         _("Boot from image (creates a new volume)")))
 -            except Exception:
 -                exceptions.handle(request, _('Unable to retrieve extensions '
--                                            'information.'))
+-                                             'information.'))
 -
--            source_type_choices.append(("volume_snapshot_id",
--                    _("Boot from volume snapshot (creates a new volume)")))
+-            source_type_choices.append(
+-                ("volume_snapshot_id",
+-                 _("Boot from volume snapshot (creates a new volume)")))
          self.fields['source_type'].choices = source_type_choices
  
-     def clean(self):
+     @memoized.memoized_method