Skip to content

Commit

Permalink
Restore 00-config template
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
fmount committed Oct 11, 2024
1 parent 3466731 commit b179e61
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion templates/common/config/00-config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ log_file = {{ .LogFile }}
{{ end }}
# cache related parameters
{{ if (index . "CacheEnabled") }}
>>>>>>> 2e22c55 (Remove enabled_backend entry from 00-config.conf)
image_cache_dir = {{ .ImageCacheDir }}
image_cache_max_size = {{ .CacheMaxSize }}
image_cache_stall_time = 86400
Expand All @@ -37,6 +36,9 @@ db_max_retries = -1
[file]
filesystem_store_datadir = /var/lib/glance/images

[glance_store]
default_backend=default_backend

[keystone_authtoken]
www_authenticate_uri={{ .KeystonePublicURL }}
auth_url={{ .KeystoneInternalURL }}
Expand Down

0 comments on commit b179e61

Please sign in to comment.