diff options
| author |   David Moreau Simard <dms@redhat.com> | 2016-02-11 11:55:54 -0500 |
|---|---|---|
| committer |   John Trowbridge <trown@redhat.com> | 2016-02-23 08:26:27 -0500 |
| commit | ab068a824ed51e78bf111387223e58e885ec5c84 (patch) | |
| tree | f69ecd208b384e4d7509d9b404659799555c9158 /network | |
| parent | 8c6943e898453b3e6fb05c1d238301bdb7d0fef5 (diff) | |
Nova Neutron configuration now uses keystone v3 endpoint
Our current nova-neutron configuration does not work with
the latest puppet-nova. In particular, this patch[1].
This commit adds keystone v3 endpoints to the map and gets the
nova::network::neutron configuration to use them.
[1] https://github.com/openstack/puppet-nova/commit/d09868a59c451932d67c66101b725182d7066a14
Change-Id: Ifb8c23c81c665c2732fa5cd757760668b06a449a
Diffstat (limited to 'network')
| -rw-r--r-- | network/endpoints/endpoint_map.yaml | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 096ee558..54ec7e33 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -65,6 +65,9 @@ parameters: KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'} KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'} KeystonePublic: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'} + KeystoneV3Admin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'} + KeystoneV3Internal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'} + KeystoneV3Public: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'} NeutronAdmin: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'} NeutronInternal: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'} NeutronPublic: {protocol: 'http', port: '9696', host: 'IP_ADDRESS'} @@ -267,6 +270,32 @@ resources: IP: {get_param: KeystonePublicApiVirtualIP} CloudName: {get_param: CloudName} UriSuffix: '/v2.0/ec2tokens' + # TODO(ayoung): V3 is a temporary fix. Endpoints should be versionless. + # Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486 + KeystoneV3Internal: + type: OS::TripleO::Endpoint + properties: + EndpointName: KeystoneV3Internal + EndpointMap: { get_param: EndpointMap } + IP: {get_param: KeystonePublicApiVirtualIP} + CloudName: {get_param: CloudName} + UriSuffix: '/v3' + KeystoneV3Public: + type: OS::TripleO::Endpoint + properties: + EndpointName: KeystoneV3Public + EndpointMap: { get_param: EndpointMap } + IP: {get_param: PublicVirtualIP} + CloudName: {get_param: CloudName} + UriSuffix: '/v3' + KeystoneV3Admin: + type: OS::TripleO::Endpoint + properties: + EndpointName: KeystoneV3Admin + EndpointMap: { get_param: EndpointMap } + IP: {get_param: KeystoneAdminApiVirtualIP} + CloudName: {get_param: CloudName} + UriSuffix: '/v3' NeutronInternal: type: OS::TripleO::Endpoint @@ -461,6 +490,9 @@ outputs: KeystonePublic: {get_attr: [ KeystonePublic, endpoint] } KeystoneAdmin: {get_attr: [ KeystoneAdmin, endpoint] } KeystoneEC2: {get_attr: [ KeystoneEC2, endpoint] } + KeystoneV3Internal: {get_attr: [ KeystoneV3Internal, endpoint] } + KeystoneV3Public: {get_attr: [ KeystoneV3Public, endpoint] } + KeystoneV3Admin: {get_attr: [ KeystoneV3Admin, endpoint] } NeutronInternal: {get_attr: [ NeutronInternal, endpoint] } NeutronPublic: {get_attr: [ NeutronPublic, endpoint] } NeutronAdmin: {get_attr: [ NeutronAdmin, endpoint] } |