diff --git a/ansible/roles/kolla-openstack/templates/glance.conf.j2 b/ansible/roles/kolla-openstack/templates/glance.conf.j2 index cf4c9de77757f789ff757e591c9fbbed20b79938..34692b6d3a01a29e2026fcfbc428ec70573953be 100644 --- a/ansible/roles/kolla-openstack/templates/glance.conf.j2 +++ b/ansible/roles/kolla-openstack/templates/glance.conf.j2 @@ -1,34 +1,5 @@ # {{ 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 %} ####################### # Extra configuration