diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 1fca37bf19..99e361534e 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 @@ -680,7 +676,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: "/"