openstack/kolla-ansible
Code Issues Proposed changes

Merge "Upgrade identity v2 to identity v3 API"

Browse Source
This commit is contained in:
Zuul 2018-07-11 06:40:42 +00:00 committed by Gerrit Code Review
commit dc3492867f
2 changed files with 10 additions and 4 deletions
ansible/roles
karbor/templates/providers.d
openstack-infra.conf.j2
neutron/templates
neutron_lbaas.conf.j2

7
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

7
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 %}