From 30213bd0feec630cc142a20033231005caffd6d7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 24 Jun 2022 14:43:34 +0900 Subject: [PATCH] Glance: Remove unnecessary override of [paste_deploy] config_file Glance by default searches glance-api-paste.ini in config directories as long as the glance-api.conf file is given in the end. In case we really need this then that should be configured using a new native puppet parameter, otherwise this prevents adding the parameter to puppet-glance. Change-Id: I602a7e063ccbf9f0fc10bb8e2c175ee6220c30f6 --- deployment/glance/glance-api-container-puppet.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 45c21c6eab..2b410b2c8b 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -488,11 +488,7 @@ outputs: config_settings: map_merge: - get_attr: [TLSProxyBase, role_data, config_settings] - # Set this for glance as it does not have a default - - glance::config::api_config: - paste_deploy/config_file: - value: '/etc/glance/glance-api-paste.ini' - glance::api::db::database_connection: + - glance::api::db::database_connection: make_url: scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} username: glance @@ -678,7 +674,10 @@ outputs: config_image: {get_attr: [RoleParametersValue, value, ContainerGlanceApiConfigImage]} kolla_config: /var/lib/kolla/config_files/glance_api.json: - command: /usr/bin/glance-api --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf + # NOTE(tkajinam): glance-api.conf should come last because name of + # the last config file is used to locate + # api-paste.ini file + command: /usr/bin/glance-api --config-file /etc/glance/glance-image-import.conf --config-file /etc/glance/glance-api.conf config_files: - source: "/var/lib/kolla/config_files/src/*" dest: "/"