From e6fb69786f1fd754c9c02dd2c68bec81c9342cfb Mon Sep 17 00:00:00 2001 From: Liam Young Date: Mon, 5 Mar 2018 17:13:30 +0000 Subject: [PATCH] Fix creds for keystone v3 deploys with designate The charm was using keystone v2 creds to attempt to authenticate with keystone despite keystone using v3. Change-Id: Ib815fa5d77949e6cd6e79cd9fa9a088e5f6ae394 --- templates/parts/section-designate | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/parts/section-designate b/templates/parts/section-designate index aaeb97b6..d37d2cb4 100644 --- a/templates/parts/section-designate +++ b/templates/parts/section-designate @@ -1,9 +1,21 @@ [designate] url = {{ designate_endpoint }}/v2 +{% if api_version == "3" -%} +auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }} +auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} +auth_type = password +project_domain_name = {{ admin_domain_name }} +user_domain_name = {{ admin_domain_name }} +project_name = {{ admin_tenant_name }} +username = {{ admin_user }} +password = {{ admin_password }} +signing_dir = {{ signing_dir }} +{% else -%} admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} admin_username = {{ admin_user }} admin_password = {{ admin_password }} admin_tenant_name = {{ admin_tenant_name }} +{% endif -%} allow_reverse_dns_lookup = {{ allow_reverse_dns_lookup }} {% if allow_reverse_dns_lookup -%} ipv4_ptr_zone_prefix_size = {{ ipv4_ptr_zone_prefix_size }}