author | david.comay@oracle.com |
Wed, 09 Jul 2014 15:10:27 -0700 | |
branch | s11u2-sru |
changeset 3201 | 6839f7d1f036 |
permissions | -rw-r--r-- |
3201
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
1 |
Internal patch to only enable the current supported boot source (Boot from Image). |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
2 |
This patch will not be committed upsteam. |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
3 |
|
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
4 |
--- horizon-2013.2.3/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py.orig 2014-04-03 11:45:53.000000000 -0700 |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
5 |
+++ horizon-2013.2.3/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py 2014-07-07 14:53:44.291365109 -0700 |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
6 |
@@ -137,22 +137,7 @@ |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
7 |
source_type_choices = [ |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
8 |
('', _("--- Select source ---")), |
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", |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
19 |
- _("Boot from image (creates a new volume)."))) |
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", |
6839f7d1f036
18686478 kstat warning every minute in nova-compute log on SPARC
david.comay@oracle.com
parents:
diff
changeset
|
25 |
- _("Boot from volume snapshot (creates a new volume)."))) |
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): |