Merge "Add configuration options for the image cache"

manifests/api.pp

@@ -403,6 +403,8 @@ class glance::api(
     'DEFAULT/scrub_time':              value => $scrub_time;
     'DEFAULT/delayed_delete':          value => $delayed_delete;
     'DEFAULT/image_cache_dir':         value => $image_cache_dir;
+    'DEFAULT/image_cache_stall_time':  value => $image_cache_stall_time;
+    'DEFAULT/image_cache_max_size':    value => $image_cache_max_size;
     'DEFAULT/enabled_import_methods':  value => $enabled_import_methods_real;
     'DEFAULT/node_staging_uri':        value => $node_staging_uri;
     'DEFAULT/image_member_quota':      value => $image_member_quota;
@@ -475,6 +477,7 @@ class glance::api(
   }
 
   glance_cache_config {
+    'DEFAULT/image_cache_dir':        value => $image_cache_dir;
     'DEFAULT/image_cache_stall_time': value => $image_cache_stall_time;
     'DEFAULT/image_cache_max_size':   value => $image_cache_max_size;
     'glance_store/os_region_name':    value => $os_region_name;

releasenotes/notes/add_image_cache_settings-cd6c9176167010ba.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - Enabled image_cache_stall_time & image_cache_max_size in
+    glance-api.conf & image_cache_dir in glance-cache.conf, as
+    these parameters need the same values in both conf files,
+    otherwise the cache will potentially run into problems.

spec/classes/glance_api_spec.rb

@@ -136,6 +136,8 @@ describe 'glance::api' do
             'delayed_delete',
             'scrub_time',
             'image_cache_dir',
+            'image_cache_stall_time',
+            'image_cache_max_size',
             'node_staging_uri',
             'image_member_quota',
             'enable_v1_api',
@@ -170,6 +172,7 @@ describe 'glance::api' do
           [
             'registry_host',
             'registry_port',
+            'image_cache_dir',
             'image_cache_stall_time',
             'image_cache_max_size',
           ].each do |config|