components/openstack/horizon/patches/18-launch-instance-js.patch
author david.comay@oracle.com
Fri, 09 Sep 2016 16:31:02 -0700
changeset 6878 252671ed151a
parent 6856 356aeea98c39
permissions -rw-r--r--
24617715 'mysql_storage_engine' option's help message could be improved
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6856
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     1
In house patch to modify the AngularJS workflows for the
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     2
LaunchInstanceNG wizard. This patch can be removed once we support the
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     3
featues it disables.
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     4
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     5
--- horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js.1	2016-06-02 13:05:56.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     6
+++ horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js	2016-06-02 13:05:56.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     7
@@ -206,7 +206,9 @@
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     8
           novaAPI.getFlavors(true, true).then(onGetFlavors, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
     9
           novaAPI.getKeypairs().then(onGetKeypairs, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    10
           novaAPI.getLimits().then(onGetNovaLimits, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    11
-          securityGroup.query().then(onGetSecurityGroups, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    12
+          /* Disable security groups
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    13
+           * securityGroup.query().then(onGetSecurityGroups, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    14
+           */
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    15
           serviceCatalog.ifTypeEnabled('network').then(getNetworks, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    16
           serviceCatalog.ifTypeEnabled('volume').then(getVolumes, noop),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    17
           settings.getSetting('LAUNCH_INSTANCE_DEFAULTS').then(setDefaultValues, noop)
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    18
--- horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js.1	2016-06-02 13:05:56.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    19
+++ horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js	2016-06-02 13:05:56.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    20
@@ -72,9 +72,13 @@
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    21
      */
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    22
     ctrl.bootSourcesOptions = [
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    23
       { type: bootSourceTypes.IMAGE, label: gettext('Image') },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    24
-      { type: bootSourceTypes.INSTANCE_SNAPSHOT, label: gettext('Instance Snapshot') },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    25
-      { type: bootSourceTypes.VOLUME, label: gettext('Volume') },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    26
-      { type: bootSourceTypes.VOLUME_SNAPSHOT, label: gettext('Volume Snapshot') }
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    27
+      /*
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    28
+       * Disable all sources other than 'Image'
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    29
+       *
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    30
+       * { type: bootSourceTypes.INSTANCE_SNAPSHOT, label: gettext('Instance Snapshot') },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    31
+       * { type: bootSourceTypes.VOLUME, label: gettext('Volume') },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    32
+       * { type: bootSourceTypes.VOLUME_SNAPSHOT, label: gettext('Volume Snapshot') }
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    33
+       */
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    34
     ];
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    35
 
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    36
     ctrl.updateBootSourceSelection = updateBootSourceSelection;
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    37
--- horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-workflow.service.js.1	2016-07-21 03:24:05.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    38
+++ horizon-9.1.0/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-workflow.service.js	2016-07-21 03:24:05.000000000 -0700
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    39
@@ -67,14 +67,17 @@
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    40
           formName: 'launchInstanceNetworkPortForm',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    41
           requiredServiceTypes: ['network']
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    42
         },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    43
+	/*
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    44
+         * Disable Security Groups.	
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    45
+         *{
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    46
+         * id: 'secgroups',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    47
+         * title: gettext('Security Groups'),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    48
+         * templateUrl: basePath + 'security-groups/security-groups.html',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    49
+         * helpUrl: basePath + 'security-groups/security-groups.help.html',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    50
+         * formName: 'launchInstanceAccessAndSecurityForm'
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    51
+         *},
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    52
+	 */
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    53
         {
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    54
-          id: 'secgroups',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    55
-          title: gettext('Security Groups'),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    56
-          templateUrl: basePath + 'security-groups/security-groups.html',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    57
-          helpUrl: basePath + 'security-groups/security-groups.help.html',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    58
-          formName: 'launchInstanceAccessAndSecurityForm'
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    59
-        },
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    60
-        {
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    61
           id: 'keypair',
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    62
           title: gettext('Key Pair'),
356aeea98c39 24465729 Update Horizon for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff changeset
    63
           templateUrl: basePath + 'keypair/keypair.html',