From 1ed01f661a41758c3302676e9b94b2594ef2722f Mon Sep 17 00:00:00 2001
From: Francesco Pantano <fpantano@redhat.com>
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 <fpantano@redhat.com>
---
 templates/common/config/00-config.conf | 85 +++++++++++++-------------
 1 file changed, 41 insertions(+), 44 deletions(-)

diff --git a/templates/common/config/00-config.conf b/templates/common/config/00-config.conf
index 5c8da53a..f938335d 100644
--- a/templates/common/config/00-config.conf
+++ b/templates/common/config/00-config.conf
@@ -1,42 +1,40 @@
+{{ if (index . "MinimalConfig") -}}
+[DEFAULT]
+verbose=True
+{{ if (index . "CacheEnabled") -}}
+image_cache_dir = {{ .ImageCacheDir }}
+image_cache_max_size =  {{ .CacheMaxSize }}
+image_cache_stall_time = 86400
+{{ end -}}
+
+[database]
+connection = {{ .DatabaseConnection }}
+{{ else -}}
 [DEFAULT]
 verbose=True
-{{ if (index . "ShowImageDirectUrl") }}
 show_image_direct_url={{ .ShowImageDirectUrl }}
-{{ end }}
-{{ if (index . "ShowMultipleLocations") }}
 show_multiple_locations={{ .ShowMultipleLocations }}
-{{ end }}
 node_staging_uri=file:///var/lib/glance/staging
 enabled_import_methods=[web-download,glance-direct]
-bind_host=localhost
+bind_host=127.0.0.1
 bind_port=9293
 workers=3
-{{ if (index . "LogFile") }}
 # enable log rotation in oslo config by default
 max_logfile_count=5
 max_logfile_size_mb=50
 log_rotation_type=size
 log_file = {{ .LogFile }}
-{{ end }}
 enabled_backends=default_backend:file
-# cache related parameters
-{{ if (index . "CacheEnabled") }}
+{{ if (index . "CacheEnabled") -}}
 image_cache_dir = {{ .ImageCacheDir }}
 image_cache_max_size =  {{ .CacheMaxSize }}
 image_cache_stall_time = 86400
-{{ end }}
+{{ end -}}
 
-{{ if (index . "QuotaEnabled") }}
 use_keystone_limits = {{ .QuotaEnabled }}
 
-[oslo_limit]
-password = {{ .ServicePassword }}
-{{ end }}
-
 [database]
-{{ if (index . "DatabaseConnection") }}
 connection = {{ .DatabaseConnection }}
-{{ end }}
 max_retries = -1
 db_max_retries = -1
 
@@ -47,33 +45,19 @@ filesystem_store_datadir = /var/lib/glance/images
 default_backend=default_backend
 
 [keystone_authtoken]
-{{ if (index . "KeystonePublicURL") }}
 www_authenticate_uri={{ .KeystonePublicURL }}
-{{ end }}
-{{ if (index . "KeystoneInternalURL") }}
 auth_url={{ .KeystoneInternalURL }}
-{{ end }}
 auth_type=password
-{{ if (index . "ServiceUser") }}
 username={{ .ServiceUser }}
-{{ end }}
-{{ if (index . "ServicePassword") }}
 password = {{ .ServicePassword }}
-{{ end }}
-{{ if (index . "MemcachedServersWithInet") }}
-memcached_servers = {{ .MemcachedServersWithInet }}
-{{ end }}
 project_domain_name=Default
 user_domain_name=Default
 project_name=service
 
-{{ if (index . "ServicePassword") }}
 [service_user]
 password = {{ .ServicePassword }}
-{{ end }}
 
 [oslo_messaging_notifications]
-# TODO: update later once rabbit is working
 #driver=messagingv2
 driver=noop
 
@@ -81,11 +65,11 @@ driver=noop
 enable_proxy_headers_parsing=True
 
 [paste_deploy]
-{{ if (index . "CacheEnabled") }}
+{{ if (index . "CacheEnabled") -}}
 flavor = keystone+cachemanagement
-{{ else }}
+{{ else -}}
 flavor = keystone
-{{ end }}
+{{ end -}}
 
 [os_glance_staging_store]
 filesystem_store_datadir = /var/lib/glance/os_glance_staging_store/
@@ -94,27 +78,31 @@ filesystem_store_datadir = /var/lib/glance/os_glance_staging_store/
 filesystem_store_datadir = /var/lib/glance/os_glance_tasks_store/
 
 [oslo_limit]
-{{ if (index . "KeystoneInternalURL") }}
 auth_url={{ .KeystoneInternalURL }}
-{{ end }}
 auth_type = password
-{{ if (index . "ServiceUser") }}
 username={{ .ServiceUser }}
-{{ end }}
+password = {{ .ServicePassword }}
 system_scope = all
-{{ if (index . "DomainID") }}
+{{ if (index . "DomainID") -}}
 user_domain_id = {{ .DomainID }}
-{{ end }}
-{{ if (index . "EndpointID") }}
+{{ end -}}
+{{ if (index . "EndpointID") -}}
 endpoint_id = {{ .EndpointID }}
-{{ end }}
-{{ if (index . "Region") }}
+{{ end -}}
+{{ if (index . "Region") -}}
 region_name = {{ .Region }}
-{{ end }}
+{{ end -}}
+
+[image_import_opts]
+image_import_plugins = ['no_op']
 
 [os_brick]
 lock_path = /var/locks/openstack/os-brick
 
+[oslo_policy]
+enforce_new_defaults = true
+enforce_scope = true
+
 [image_import_opts]
 {{ if (index . "ImageConversion") }}
 image_import_plugins = ['image_conversion']
@@ -123,3 +111,12 @@ output_format = raw
 {{ else }}
 image_import_plugins = ['no_op']
 {{ end }}
+
+[key_manager]
+backend = barbican
+
+[barbican]
+auth_endpoint={{ .KeystoneInternalURL }}
+
+{{/* not "MinimalConfig" */ -}}
+{{ end -}}