From: Bill Owen <billowen@us.ibm.com>
Date: Wed, 28 Aug 2013 22:54:54 +0000 (-0700)
Subject: Pass MB size on copy_volume_data call copy_volume
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=473b429c861d26b927772b2efb828839821250e3;p=openstack-build%2Fcinder-build.git

Pass MB size on copy_volume_data call copy_volume

Modify cinder/volume/driver.py method copy_volume_data
to pass size in MB when calling cinder/volume/utils/copy_volume.py

Closes-Bug #1218054

Change-Id: I5430f015ef0f0077b4794f1ff458e3f54cc4dc06
---

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 9dbf3778e..83d172933 100644
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -271,9 +271,10 @@ class VolumeDriver(object):
                                                force=True)
 
         try:
+            size_in_mb = int(src_vol['size']) * 1024    # vol size is in GB
             volume_utils.copy_volume(src_attach_info['device']['path'],
                                      dest_attach_info['device']['path'],
-                                     src_vol['size'])
+                                     size_in_mb)
             copy_error = False
         except Exception:
             with excutils.save_and_reraise_exception():