commit 5c51ade11c7d38a0715fa17fd629cb4f90b11d3f
Author: PranaliD <pdeore@redhat.com>
Date:   Thu Sep 10 10:40:18 2020 +0000

    Enable glance sparse image upload
    
    To handle sparse image upload, new config parameters
    ``rbd_thin_provisioning`` and ``filesystem_thin_provisioning``
    have been added in glance for rbd and filesystem backends
    respectively with enabling image_conversion plugin for both
    types of backends.
    
    To make the above parameters enable, adding 'GlanceSparseUploadEnabled'
    parameter in THT.
    
    Depends-On: Ic95fa45af0f1db92d8425862c6267f466764fbbe
    Depends-On: I90c8ea98a96fa57f5bf3bf0c6b2b37ec95474baf
    
    Partially Implements: blueprint handle-sparse-image
    
    Change-Id: I5a339e9850be3825540873736b9734178994ce21

diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index ff4a159..ba93aa8 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -193,6 +193,11 @@ parameters:
     description: >
       NFS mount options for NFS image import staging
     type: string
+  GlanceSparseUploadEnabled:
+    default: false
+    description: >
+      When using GlanceBackend 'file' and 'rbd' to enable or not sparse upload.
+    type: boolean
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -289,6 +294,7 @@ parameters:
 conditions:
 
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+  glance_sparse_upload_enabled: {equals : [{get_param: GlanceSparseUploadEnabled}, true]}
   cinder_backend_enabled:
     or:
     - equals:
@@ -316,10 +322,13 @@ conditions:
           data: {get_param: GlanceMultistoreConfig}
       - true
   force_image_conversion_plugin:
-    and:
-      - rbd_backend_enabled
-      - equals: [{get_param: GlanceImageImportPlugins}, ['no_op']]
-      - equals: [{get_param: NovaEnableRbdBackend}, true]
+    or:
+      - and:
+        - rbd_backend_enabled
+        - equals: [{get_param: GlanceImageImportPlugins}, ['no_op']]
+        - equals: [{get_param: NovaEnableRbdBackend}, true]
+      - glance_sparse_upload_enabled
+
   use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
   glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
@@ -476,6 +485,8 @@ outputs:
                     $NETWORK: {get_param: [ServiceNetMap, GlanceApiNetwork]}
             glance_notifier_strategy: {get_param: GlanceNotifierStrategy}
             glance_log_file: {get_param: GlanceLogFile}
+            glance::backend::rbd::rbd_thin_provisioning: {get_param: GlanceSparseUploadEnabled}
+            glance::backend::file::filesystem_thin_provisioning: {get_param: GlanceSparseUploadEnabled}
             glance::backend::swift::swift_store_auth_address: {get_param: [EndpointMap, KeystoneV3Internal, uri] }
             glance::backend::swift::swift_store_user: service:glance
             glance::backend::swift::swift_store_key: {get_param: GlancePassword}
diff --git a/releasenotes/notes/enable_glance_sparse_image_upload-fe9e594f91cf57f1.yaml b/releasenotes/notes/enable_glance_sparse_image_upload-fe9e594f91cf57f1.yaml
new file mode 100644
index 0000000..af560a4
--- /dev/null
+++ b/releasenotes/notes/enable_glance_sparse_image_upload-fe9e594f91cf57f1.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add GlanceSparseUploadEnabled to enable sparse image upload
+    for rbd and filesystem glance backends.
+    By default GlanceSparseUploadEnabled is disabled, it needs to be
+    enabled while using sparse image upload for rbd and file stores.