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] #385 [2] #378 Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Oct 11, 2024 · 17b979f · 17b979f
1 parent 3466731
commit 17b979f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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