diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index 2a92ec229b..f4f825320f 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -22,10 +22,16 @@ Barbican: Designate: Internal: net_param: DesignateApi + uri_suffixes: + '': /v2 Public: net_param: Public + uri_suffixes: + '': /v2 Admin: net_param: DesignateApi + uri_suffixes: + '': /v2 port: 9001 Ec2Api: diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 0970d229c5..8f1de889a3 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -1928,6 +1928,7 @@ outputs: template: NETWORK_uri port: get_param: [EndpointMap, DesignateAdmin, port] + path: /v2 uri_no_suffix: make_url: scheme: @@ -2009,6 +2010,7 @@ outputs: template: NETWORK_uri port: get_param: [EndpointMap, DesignateInternal, port] + path: /v2 uri_no_suffix: make_url: scheme: @@ -2090,6 +2092,7 @@ outputs: template: NETWORK_uri port: get_param: [EndpointMap, DesignatePublic, port] + path: /v2 uri_no_suffix: make_url: scheme: diff --git a/puppet/services/designate-api.yaml b/puppet/services/designate-api.yaml index fb3a9e04af..925240e28b 100644 --- a/puppet/services/designate-api.yaml +++ b/puppet/services/designate-api.yaml @@ -108,9 +108,9 @@ outputs: service_config_settings: keystone: designate::keystone::auth::tenant: 'service' - designate::keystone::auth::public_url: {get_param: [EndpointMap, DesignatePublic, uri]} - designate::keystone::auth::internal_url: { get_param: [ EndpointMap, DesignateInternal, uri ] } - designate::keystone::auth::admin_url: { get_param: [ EndpointMap, DesignateAdmin, uri ] } + designate::keystone::auth::public_url: {get_param: [EndpointMap, DesignatePublic, uri_no_suffix]} + designate::keystone::auth::internal_url: { get_param: [ EndpointMap, DesignateInternal, uri_no_suffix ] } + designate::keystone::auth::admin_url: { get_param: [ EndpointMap, DesignateAdmin, uri_no_suffix ] } designate::keystone::auth::password: {get_param: DesignatePassword} designate::keystone::auth::region: {get_param: KeystoneRegion} neutron_api: