diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-08 21:44:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-08 21:44:18 +0000 |
| commit | 8b6834f54a57271e3e2d55cd25a62dc320d610cd (patch) | |
| tree | ad3909b1a9342d9a6152d7717268a1e28bf70394 /nova/virt | |
| parent | f9b0b9f2d33fe97f241415e248b690a61b9f8098 (diff) | |
| parent | f163bffa55d770e70725751f53212792b9de128b (diff) | |
Merge "Remove uses of instance['instance_type'] from powervm driver."
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/powervm/blockdev.py | 5 | ||||
| -rwxr-xr-x | nova/virt/powervm/driver.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py index 75f90e327..c8d58d939 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -20,6 +20,7 @@ import re from oslo.config import cfg +from nova.compute import instance_types from nova.compute import task_states from nova.image import glance from nova.openstack.common import excutils @@ -174,8 +175,8 @@ class PowerVMLocalVolumeAdapter(PowerVMDiskAdapter): # calculate root device size in bytes # we respect the minimum root device size in constants - size_gb = max(instance['instance_type']['root_gb'], - constants.POWERVM_MIN_ROOT_GB) + instance_type = instance_types.extract_instance_type(instance) + size_gb = max(instance_type['root_gb'], constants.POWERVM_MIN_ROOT_GB) size = size_gb * 1024 * 1024 * 1024 try: diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 7484e91b6..c388eecfd 100755 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -19,6 +19,7 @@ import time from oslo.config import cfg +from nova.compute import instance_types from nova.image import glance from nova.openstack.common import log as logging from nova.virt import driver @@ -276,7 +277,8 @@ class PowerVMDriver(driver.ComputeDriver): """ lpar_obj = self._powervm._create_lpar_instance(instance) - new_lv_size = instance['instance_type']['root_gb'] + instance_type = instance_types.extract_instance_type(instance) + new_lv_size = instance_type['root_gb'] old_lv_size = disk_info['old_lv_size'] if 'root_disk_file' in disk_info: disk_size = max(int(new_lv_size), int(old_lv_size)) |