Merge "Move [neutron] auth_url to KeystoneV3Internal"

This commit is contained in:
Zuul 2019-01-04 11:14:51 +00:00 committed by Gerrit Code Review
commit 6a81b393c9
2 changed files with 8 additions and 1 deletions

View File

@ -312,7 +312,7 @@ outputs:
nova::network::neutron::dhcp_domain: '' nova::network::neutron::dhcp_domain: ''
nova::network::neutron::neutron_password: {get_param: NeutronPassword} nova::network::neutron::neutron_password: {get_param: NeutronPassword}
nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]} nova::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]} nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
nova::rabbit_heartbeat_timeout_threshold: 60 nova::rabbit_heartbeat_timeout_threshold: 60
nova::cinder_catalog_info: 'volumev3:cinderv3:internalURL' nova::cinder_catalog_info: 'volumev3:cinderv3:internalURL'
nova::host: "%{hiera('fqdn_canonical')}" nova::host: "%{hiera('fqdn_canonical')}"

View File

@ -0,0 +1,7 @@
---
fixes:
- |
In other sections we already use the internal endpoints for
authentication urls. With this change the auth_uri in the
neutron section gets moved from KeystoneV3Admin to
KeystoneV3Internal.