Merge "Add more settings for glance image cache"

deployment/glance/glance-api-container-puppet.yaml

@@ -79,6 +79,22 @@ parameters:
     description: Enable Glance Image Cache
     type: boolean
     default: False
+  GlanceImageCacheDir:
+    description: Base directory that the Image Cache uses
+    type: string
+    default: '/var/lib/glance/image-cache'
+  GlanceImageCacheMaxSize:
+    description: >
+      The upper limit on cache size, in bytes, after which the cache-pruner
+      cleans up the image cache.
+    type: number
+    default: 10737418240
+  GlanceImageCacheStallTime:
+    description: >
+      The amount of time, in seconds, to let an image remain in the cache
+      without being accessed.
+    type: number
+    default: 86400
   GlanceNfsShare:
     default: ''
     description: >
@@ -398,6 +414,13 @@ outputs:
               glance::backend::cinder::cinder_store_user_name: 'glance'
               glance::backend::cinder::cinder_store_password: {get_param: GlancePassword}
             - {}
+          -
+            if:
+            - glance_cache_enabled
+            - glance::api::image_cache_dir: {get_param: GlanceImageCacheDir}
+              glance::api::image_cache_max_size: {get_param: GlanceImageCacheMaxSize}
+              glance::api::image_cache_stall_time: {get_param: GlanceImageCacheStallTime}
+            - {}
           -
             if:
             - glance_netapp_nfs_enabled

releasenotes/notes/add_image_cache_settings-50af5ff56a7d7f75.yaml

@@ -0,0 +1,10 @@
+---
+features:
+  - Add GlanceImageCacheDir parameter to set base directory location
+    that the Image Cache uses.
+
+    Add GlanceImageCacheMaxSize parameter to set the upper limit on cache
+    size, in bytes, after which the cache-pruner cleans up the image cache.
+
+    Add GlanceImageCacheStallTime parameter to set the amount of time to let
+    an image remain in the cache without being accessed.