| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Mon, 20 Jul 2015 09:11:32 -0700 | |
| branch | s11u2-sru |
| changeset 4673 | 7ca7277ea064 |
| parent 4156 | 4b1def16fe9b |
| child 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
1 |
Internal patch to only enable the current supported boot source (Boot |
|
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
2 |
from Image). This patch will not be committed upstream. |
|
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
3 |
|
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
4 |
--- horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.~1~ 2014-10-16 06:20:50.000000000 -0700 |
|
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
5 |
+++ horizon-2014.2.2/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2014-10-24 11:58:37.591052103 -0700 |
|
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
6 |
@@ -141,22 +141,7 @@ class SetInstanceDetailsAction(workflows |
|
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
7 |
source_type_choices = [ |
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
8 |
('', _("Select source")),
|
|
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
9 |
("image_id", _("Boot from image")),
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
10 |
- ("instance_snapshot_id", _("Boot from snapshot")),
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
11 |
] |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
12 |
- if base.is_service_enabled(request, 'volume'): |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
13 |
- source_type_choices.append(("volume_id", _("Boot from volume")))
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
14 |
- |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
15 |
- try: |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
16 |
- if api.nova.extension_supported("BlockDeviceMappingV2Boot",
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
17 |
- request): |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
18 |
- source_type_choices.append(("volume_image_id",
|
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
19 |
- _("Boot from image (creates a new volume)")))
|
|
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
20 |
- except Exception: |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
21 |
- exceptions.handle(request, _('Unable to retrieve extensions '
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
22 |
- 'information.')) |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
23 |
- |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
24 |
- source_type_choices.append(("volume_snapshot_id",
|
|
4156
4b1def16fe9b
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
3201
diff
changeset
|
25 |
- _("Boot from volume snapshot (creates a new volume)")))
|
|
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
26 |
self.fields['source_type'].choices = source_type_choices |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
27 |
|
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
28 |
def clean(self): |