diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index 93eb850a59d..3ce44a17de5 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -84,7 +84,7 @@ QEMU_IMG_VERSION = None QEMU_IMG_MIN_FORCE_SHARE_VERSION = [2, 10, 0] QEMU_IMG_MIN_CONVERT_LUKS_VERSION = '2.10' -COMPRESSIBLE_IMAGE_FORMATS = ('qcow2') +COMPRESSIBLE_IMAGE_FORMATS = ('qcow2',) def fixup_disk_format(disk_format): @@ -634,7 +634,7 @@ def _validate_file_format(image_data, expected_format): def upload_volume(context, image_service, image_meta, volume_path, - volume_format='raw', run_as_root=True): + volume_format='raw', run_as_root=True, compress=True): image_id = image_meta['id'] if (image_meta['disk_format'] == volume_format): LOG.debug("%s was %s, no need to convert to %s", diff --git a/cinder/tests/unit/test_image_utils.py b/cinder/tests/unit/test_image_utils.py index f994b259f53..44d1e4baf2a 100644 --- a/cinder/tests/unit/test_image_utils.py +++ b/cinder/tests/unit/test_image_utils.py @@ -747,7 +747,7 @@ class TestUploadVolume(test.TestCase): temp_file = mock_temp.return_value.__enter__.return_value output = image_utils.upload_volume(ctxt, image_service, image_meta, - volume_path) + volume_path, compress=True) self.assertIsNone(output) mock_convert.assert_called_once_with(volume_path,