Merge "Enable Glance Image Cache"

puppet/services/glance-api.yaml

@@ -104,6 +104,10 @@ parameters:
     description: >
       When using GlanceBackend 'file', mount NFS share for image storage.
     type: boolean
+  GlanceCacheEnabled:
+    description: Enable Glance Image Cache
+    type: boolean
+    default: False
   GlanceNfsShare:
     default: ''
     description: >
@@ -190,6 +194,7 @@ conditions:
   glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
   service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
   glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]}
+  glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]}
   glance_multiple_locations:
     or:
     - glance_netapp_nfs_enabled
@@ -254,7 +259,11 @@ outputs:
             glance::api::authtoken::project_name: 'service'
             glance::keystone::authtoken::user_domain_name: 'Default'
             glance::keystone::authtoken::project_domain_name: 'Default'
-            glance::api::pipeline: 'keystone'
+            glance::api::pipeline:
+              if:
+              - glance_cache_enabled
+              - 'keystone+cachemanagement'
+              - 'keystone'
             glance::api::show_image_direct_url: true
             glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
             glance::api::os_region_name: {get_param: KeystoneRegion}

releasenotes/notes/enable-glance-image-cache-01e54adaa952f90b.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add GlanceCacheEnabled parameter which will enable the
+    glance image cache by seetting up the flavor value to
+    'keystone+cachemanagement' in glance-api.conf
+