diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-01 23:50:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-01 23:50:46 +0000 |
| commit | fa2ce247e477494bd7f53c19ea2b1f6f922ffbfc (patch) | |
| tree | 0ca6e2cf8178f0afdf6207f587340f42cedcd131 /nova/compute | |
| parent | 7928c45078f3c7127606bcb0ca8ab57412b05333 (diff) | |
| parent | e3b49a2167e5210f6984164d30376b4ac11fd245 (diff) | |
| download | nova-fa2ce247e477494bd7f53c19ea2b1f6f922ffbfc.tar.gz nova-fa2ce247e477494bd7f53c19ea2b1f6f922ffbfc.tar.xz nova-fa2ce247e477494bd7f53c19ea2b1f6f922ffbfc.zip | |
Merge "Use min_ram of original image for snapshot, even with VHD"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 103489805..25987d766 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1647,13 +1647,13 @@ class API(base.Base): #disk format of vhd is non-shrinkable if orig_image.get('disk_format') == 'vhd': - min_ram = instance['instance_type']['memory_mb'] min_disk = instance['instance_type']['root_gb'] else: #set new image values to the original image values - min_ram = orig_image.get('min_ram') min_disk = orig_image.get('min_disk') + min_ram = orig_image.get('min_ram') + return min_ram, min_disk def _get_block_device_info(self, context, instance_uuid): |