From d31cc3a34c055c6d1b7b5555c096ad9af81bd002 Mon Sep 17 00:00:00 2001
From: Carlos Meza <carlos.meza@verizondigitalmedia.com>
Date: Sun, 11 Feb 2018 22:01:14 +0000
Subject: [PATCH] expose ability to no compress qcow

---
 bootstrapvz/plugins/minimize_size/__init__.py         | 2 ++
 bootstrapvz/plugins/minimize_size/manifest-schema.yml | 2 +-
 bootstrapvz/plugins/minimize_size/tasks/shrink.py     | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bootstrapvz/plugins/minimize_size/__init__.py b/bootstrapvz/plugins/minimize_size/__init__.py
index 10420ae..e536e02 100644
--- a/bootstrapvz/plugins/minimize_size/__init__.py
+++ b/bootstrapvz/plugins/minimize_size/__init__.py
@@ -16,6 +16,8 @@ def get_shrink_type(plugins):
         shrink_type = 'vmware-vdiskmanager'
     elif shrink_type is False:
         shrink_type = None
+    elif shrink_type == 'qemu-img-no-compression':
+        shrink_type = 'qemu-img'
     return shrink_type
 
 
diff --git a/bootstrapvz/plugins/minimize_size/manifest-schema.yml b/bootstrapvz/plugins/minimize_size/manifest-schema.yml
index 0568cfa..c0de893 100644
--- a/bootstrapvz/plugins/minimize_size/manifest-schema.yml
+++ b/bootstrapvz/plugins/minimize_size/manifest-schema.yml
@@ -8,7 +8,7 @@ properties:
           shrink:
             anyOf:
               - type: boolean
-              - enum: [vmware-vdiskmanager, qemu-img]
+              - enum: [vmware-vdiskmanager, qemu-img, qemu-img-no-compression]
           zerofree:
             type: boolean
           apt:
diff --git a/bootstrapvz/plugins/minimize_size/tasks/shrink.py b/bootstrapvz/plugins/minimize_size/tasks/shrink.py
index 225de35..de1fc0c 100644
--- a/bootstrapvz/plugins/minimize_size/tasks/shrink.py
+++ b/bootstrapvz/plugins/minimize_size/tasks/shrink.py
@@ -71,8 +71,9 @@ class ShrinkVolumeWithQemuImg(Task):
     def run(cls, info):
         tmp_name = os.path.join(info.workspace, 'shrunk.' + info.volume.extension)
         shrink_cmd = ['qemu-img', 'convert', '-O', info.volume.extension, info.volume.image_path, tmp_name]
-        # Compress QCOW2 image when shrinking
-        if info.volume.extension == 'qcow2':
+        # Compress QCOW2 image when shrinking except when explicitly set not to
+        if (info.volume.extension == 'qcow2' and
+                info.manifest.plugins['minimize_size']['shrink'] != 'qemu-img-no-compression'):
             # '-c' indicates that target image must be compressed (qcow format only)
             shrink_cmd.insert(4, '-c')
         log_check_call(shrink_cmd)