diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-11 11:00:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-11 11:00:37 +0000 |
| commit | 7e31906d0185c68433215f265ae1ec1c485a3dd2 (patch) | |
| tree | cdbda3a867f8a21fd790dc3f7209104d35e21470 /network/endpoints/endpoint_data.yaml | |
| parent | 173653e700f763c53c25b472a6e59c1fa6618260 (diff) | |
| parent | d773227e7d18165750bd86a79b95d14bbc3702d9 (diff) | |
Merge "Don't have separate protocols/ports for Keystone v3"
Diffstat (limited to 'network/endpoints/endpoint_data.yaml')
| -rw-r--r-- | network/endpoints/endpoint_data.yaml | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index edcfaca1..38d684eb 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -72,40 +72,27 @@ Horizon: '': /dashboard port: 80 +# TODO(ayoung): V3 is a temporary fix. Endpoints should be versionless. +# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486 Keystone: Internal: vip_param: KeystonePublicApi uri_suffixes: '': /v2.0 EC2: /v2.0/ec2tokens + V3: /v3 names: EC2: KeystoneEC2 Public: vip_param: Public uri_suffixes: '': /v2.0 + V3: /v3 Admin: vip_param: KeystoneAdminApi uri_suffixes: '': /v2.0 - port: 35357 - port: 5000 - -# TODO(ayoung): V3 is a temporary fix. Endpoints should be versionless. -# Required for https://bugs.launchpad.net/puppet-nova/+bug/1542486 -KeystoneV3: - Internal: - vip_param: KeystonePublicApi - uri_suffixes: - '': /v3 - Public: - vip_param: Public - uri_suffixes: - '': /v3 - Admin: - vip_param: KeystoneAdminApi - uri_suffixes: - '': /v3 + V3: /v3 port: 35357 port: 5000 |