openstack/kayobe
Code Issues Proposed changes

Cleanup old and deprecated Swift configuration

Browse Source 
This is old and deprecated configuration settings for Swift not needed
anymore because kolla-ansible correctly configure glance-api.conf and
glance-swift.conf since Idddbf2ce741e0486d60e1de88c77a7f0332a5a2b when
kolla_enable_swift variable set to true. This change can be backported
through all releases till the Train.

Change-Id: I5273edc8265f115519f499e85fe12f8d22306c4b
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2022-04-20 17:12:52 +03:00
parent 45231fdd66
commit 10b8c1ead0
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ansible/roles/kolla-openstack/templates/glance.conf.j2
View File

@ -1,34 +1,5 @@
# {{ ansible_managed }} # {{ ansible_managed }}
{% if kolla_enable_swift | bool %}
[glance_store]
default_store=swift
stores=swift
{% raw %}
swift_store_user=service:{{ glance_keystone_user }}
swift_store_key={{ glance_keystone_password }}
swift_store_auth_version=2
swift_store_auth_address={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
{% endraw %}
swift_store_endpoint_type=internalURL
swift_store_create_container_on_put=True
#swift_store_config_file=/etc/glance/glance-api.conf
#default_swift_reference=swift_store_ref
#[swift_store_ref]
#{% raw %}
#user=service:{{ glance_keystone_user }}
#key={{ glance_keystone_password }}
#auth_version=2
#auth_address={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
#user_domain_id=default
#project_domain_id=default
#{% endraw %}
{% endif %}
{% if kolla_extra_glance %} {% if kolla_extra_glance %}
####################### #######################
# Extra configuration # Extra configuration