Add /v2 suffix to Designate uris

Neutron integration requires the versioned endpoint.  The Keystone
catalog value still needs to be unversioned though or Tempest
explodes.

Change-Id: I705208e3ef8a9e2e86b82b721bc87a45b6f4e36d
This commit is contained in:
Ben Nemec 2018-07-25 15:42:33 -05:00
parent 3abb38ae14
commit f0b415d2f9
3 changed files with 12 additions and 3 deletions

View File

@ -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:

View File

@ -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:

View File

@ -106,9 +106,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: