openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add /v2 suffix to Designate uris" into stable/rocky

This commit is contained in:
Zuul 2019-01-12 17:18:04 +00:00 committed by Gerrit Code Review
parent e11fa6e8ce 3c739c3cd4
commit c1ed840419
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/endpoints/endpoint_data.yaml
View File

@ -22,10 +22,16 @@ Barbican:
Designate: Designate:
Internal: Internal:
net_param: DesignateApi net_param: DesignateApi
uri_suffixes:
'': /v2
Public: Public:
net_param: Public net_param: Public
uri_suffixes:
'': /v2
Admin: Admin:
net_param: DesignateApi net_param: DesignateApi
uri_suffixes:
'': /v2
port: 9001 port: 9001
Ec2Api: Ec2Api:

3
network/endpoints/endpoint_map.yaml
View File

@ -1928,6 +1928,7 @@ outputs:
template: NETWORK_uri template: NETWORK_uri
port: port:
get_param: [EndpointMap, DesignateAdmin, port] get_param: [EndpointMap, DesignateAdmin, port]
path: /v2
uri_no_suffix: uri_no_suffix:
make_url: make_url:
scheme: scheme:
@ -2009,6 +2010,7 @@ outputs:
template: NETWORK_uri template: NETWORK_uri
port: port:
get_param: [EndpointMap, DesignateInternal, port] get_param: [EndpointMap, DesignateInternal, port]
path: /v2
uri_no_suffix: uri_no_suffix:
make_url: make_url:
scheme: scheme:
@ -2090,6 +2092,7 @@ outputs:
template: NETWORK_uri template: NETWORK_uri
port: port:
get_param: [EndpointMap, DesignatePublic, port] get_param: [EndpointMap, DesignatePublic, port]
path: /v2
uri_no_suffix: uri_no_suffix:
make_url: make_url:
scheme: scheme:

6
puppet/services/designate-api.yaml
View File

@ -108,9 +108,9 @@ outputs:
service_config_settings: service_config_settings:
keystone: keystone:
designate::keystone::auth::tenant: 'service' designate::keystone::auth::tenant: 'service'
designate::keystone::auth::public_url: {get_param: [EndpointMap, DesignatePublic, uri]} designate::keystone::auth::public_url: {get_param: [EndpointMap, DesignatePublic, uri_no_suffix]}
designate::keystone::auth::internal_url: { get_param: [ EndpointMap, DesignateInternal, uri ] } designate::keystone::auth::internal_url: { get_param: [ EndpointMap, DesignateInternal, uri_no_suffix ] }
designate::keystone::auth::admin_url: { get_param: [ EndpointMap, DesignateAdmin, uri ] } designate::keystone::auth::admin_url: { get_param: [ EndpointMap, DesignateAdmin, uri_no_suffix ] }
designate::keystone::auth::password: {get_param: DesignatePassword} designate::keystone::auth::password: {get_param: DesignatePassword}
designate::keystone::auth::region: {get_param: KeystoneRegion} designate::keystone::auth::region: {get_param: KeystoneRegion}
neutron_api: neutron_api: