Merge "Set volume_dd_blocksize configurable on per-driver basis"

diff --cc cinder/image/image_utils.py
Simple merge

diff --cc cinder/tests/test_image_utils.py
Simple merge

diff --cc cinder/tests/test_nfs.py
Simple merge

diff --cc cinder/tests/test_rbd.py
Simple merge

diff --cc cinder/tests/test_volume.py
index 8ef886fc90a35142e7c2936f32c6e4f70eb5fdd7,a18b4e12e5aff62209dbb06d4eadfb9ea3e28b21..9cb55224610ba18c90cc64aa932f140c06916bfe
--- 1/cinder/tests/test_volume.py
--- 2/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@@ -1533,10 -1498,11 +1533,11 @@@ class VolumeTestCase(BaseVolumeTestCase
                                        image_service, image_id):
              pass
  
-         def fake_fetch_to_raw(ctx, image_service, image_id, path, size=None):
+         def fake_fetch_to_raw(ctx, image_service, image_id, path, blocksize,
+                               size=None):
              pass
  
 -        def fake_clone_image(volume_ref, image_location, image_id):
 +        def fake_clone_image(volume_ref, image_location, image_id, image_meta):
              return {'provider_location': None}, True
  
          dst_fd, dst_path = tempfile.mkstemp()

diff --cc cinder/volume/driver.py
Simple merge

diff --cc cinder/volume/drivers/gpfs.py
Simple merge

diff --cc cinder/volume/drivers/lvm.py
Simple merge

diff --cc cinder/volume/drivers/nfs.py
Simple merge

diff --cc cinder/volume/drivers/rbd.py
Simple merge

diff --cc cinder/volume/drivers/scality.py
Simple merge

diff --cc cinder/volume/drivers/xenapi/sm.py
Simple merge

diff --cc cinder/volume/utils.py
Simple merge

diff --cc etc/cinder/cinder.conf.sample
Simple merge