From 17b979febe693e01dbbf5ff514b88f25723c732d Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Fri, 17 May 2024 22:18:53 +0200 Subject: [PATCH] Restore 00-config template Somehow the 00-config template introduced by PRs [1][2] has been reverted. This patch restores the missing file content. [1] https://github.com/openstack-k8s-operators/glance-operator/pull/385 [2] https://github.com/openstack-k8s-operators/glance-operator/pull/378 Signed-off-by: Francesco Pantano --- templates/common/config/00-config.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/templates/common/config/00-config.conf b/templates/common/config/00-config.conf index 22b456c3..62d9f82b 100644 --- a/templates/common/config/00-config.conf +++ b/templates/common/config/00-config.conf @@ -18,10 +18,7 @@ max_logfile_count=1 max_logfile_size_mb=20 log_rotation_type=size log_file = {{ .LogFile }} -{{ end }} -# cache related parameters -{{ if (index . "CacheEnabled") }} ->>>>>>> 2e22c55 (Remove enabled_backend entry from 00-config.conf) +{{ if (index . "CacheEnabled") -}} image_cache_dir = {{ .ImageCacheDir }} image_cache_max_size = {{ .CacheMaxSize }} image_cache_stall_time = 86400