openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Glance: Remove unnecessary override of [paste_deploy] config_file"

Browse Source
This commit is contained in:
Zuul 2022-07-06 06:58:44 +00:00 committed by Gerrit Code Review
commit da95fac558
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment/glance/glance-api-container-puppet.yaml
View File

@ -488,11 +488,7 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [TLSProxyBase, role_data, config_settings] - get_attr: [TLSProxyBase, role_data, config_settings]
# Set this for glance as it does not have a default - glance::api::db::database_connection:
- glance::config::api_config:
paste_deploy/config_file:
value: '/etc/glance/glance-api-paste.ini'
glance::api::db::database_connection:
make_url: make_url:
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
username: glance username: glance
@ -680,7 +676,10 @@ outputs:
config_image: {get_attr: [RoleParametersValue, value, ContainerGlanceApiConfigImage]} config_image: {get_attr: [RoleParametersValue, value, ContainerGlanceApiConfigImage]}
kolla_config: kolla_config:
/var/lib/kolla/config_files/glance_api.json: /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: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"