summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2013-01-29 20:44:38 -0500
committerDan Smith <danms@us.ibm.com>2013-02-04 22:24:02 -0500
commit4a980db5612494f175712e5bfb0cf6ea029b4afa (patch)
tree3fb0fcea9621b7050d0c936ab8197405d0600706
parent81da7771aaa6eec79f6b3fd91ce315cd5c5b7e7a (diff)
Make get_dev_name_for_instance() use stashed instance_type info
Related to blueprint no-db-compute Change-Id: I6a8e357b69e6cfbdfa5be846b74baf6df3b8eae4
-rw-r--r--nova/compute/utils.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index 044dccf73..35139838d 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -149,9 +149,7 @@ def get_device_name_for_instance(context, instance, bdms, device):
# NOTE(vish): remove this when xenapi is properly setting
# default_ephemeral_device and default_swap_device
if driver.compute_driver_matches('xenapi.XenAPIDriver'):
- instance_type_id = instance['instance_type_id']
- instance_type = instance_types.get_instance_type(instance_type_id)
-
+ instance_type = instance_types.extract_instance_type(instance)
if instance_type['ephemeral_gb']:
used_letters.add('b')