diff --git a/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 b/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 index a51b3c6b676aeec2edb9c0ca2a7792a87cb9ffaf..831437dbac869923213ef5154d451b6136e32169 100644 --- a/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 +++ b/ansible/roles/karbor/templates/providers.d/openstack-infra.conf.j2 @@ -9,11 +9,14 @@ plugin=karbor-server-protection-plugin bank=karbor-swift-bank-plugin [swift_client] -swift_auth_url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0/ -swift_auth_version=2 +swift_auth_url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 +swift_auth_version=3 swift_user=admin swift_key={{ keystone_admin_password }} swift_tenant_name=admin +swift_project_domain_id = {{ default_project_domain_id }} +swift_user_domain_id = {{ default_user_domain_id }} + [swift_bank_plugin] lease_expire_window=120 diff --git a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 index 118be28727e3f987c2c234210dab6d81065f7fd3..7e56c78861169199ebc25b12dd36f6850811cb06 100644 --- a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 +++ b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 @@ -9,11 +9,14 @@ service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_d {% endif %} [service_auth] -auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0 +auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 admin_tenant_name = service admin_user = neutron admin_password = {{ neutron_keystone_password }} -auth_version = 2 +auth_version = 3 region = {{ openstack_region_name }} endpoint_type = internal +project_domain_id = {{ default_project_domain_id }} +user_domain_id = {{ default_user_domain_id }} + {% endif %}