From 4968508d7fcb2e8a9c21cf6943e3064c2be94cfe Mon Sep 17 00:00:00 2001
From: chenxing <chason.chan@foxmail.com>
Date: Wed, 27 Jun 2018 15:31:36 +0800
Subject: [PATCH] Upgrade identity v2 to identity v3 API

As of the Queens release, Keystone solely implements the Identity
API v3. Support for Identity API v2.0 has been removed since Queens
in favor of the Identity API v3.

Change-Id: If65b26935e8bd1e6655d84259499f4013762e4e3
Closes-Bug: #1778846
---
 .../karbor/templates/providers.d/openstack-infra.conf.j2   | 7 +++++--
 ansible/roles/neutron/templates/neutron_lbaas.conf.j2      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

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 a51b3c6b67..831437dbac 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 118be28727..7e56c78861 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 %}