Merge "Glance: use the puppet parameter to enable image cache feature"

This commit is contained in:
Zuul 2021-01-13 08:06:25 +00:00 committed by Gerrit Code Review
commit 0538af2751
1 changed files with 2 additions and 7 deletions

View File

@ -528,7 +528,8 @@ outputs:
- -
if: if:
- glance_cache_enabled - glance_cache_enabled
- glance::api::image_cache_dir: {get_param: GlanceImageCacheDir} - tripleo::profile::base::glance::api::glance_enable_cache: true
glance::api::image_cache_dir: {get_param: GlanceImageCacheDir}
glance::api::image_cache_max_size: {get_param: GlanceImageCacheMaxSize} glance::api::image_cache_max_size: {get_param: GlanceImageCacheMaxSize}
glance::api::image_cache_stall_time: {get_param: GlanceImageCacheStallTime} glance::api::image_cache_stall_time: {get_param: GlanceImageCacheStallTime}
glance::api::cache_prefetcher_interval: {get_param: GlanceImagePrefetcherInterval} glance::api::cache_prefetcher_interval: {get_param: GlanceImagePrefetcherInterval}
@ -569,12 +570,6 @@ outputs:
- glance_netapp_nfs_enabled - glance_netapp_nfs_enabled
- include tripleo::profile::base::glance::netapp - include tripleo::profile::base::glance::netapp
- '' - ''
- if:
- glance_cache_enabled
- |
include ::glance::cache::cleaner
include ::glance::cache::pruner
- ''
- {get_attr: [MySQLClient, role_data, step_config]} - {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerGlanceApiConfigImage} config_image: {get_param: ContainerGlanceApiConfigImage}
kolla_config: kolla_config: